From cf46e7076bfd6a9a1bab091cb5e8a8d3cb8c92f0 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Thu, 15 Aug 2024 11:35:05 +0200 Subject: [PATCH 1/3] 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 Date: Thu, 15 Aug 2024 11:36:15 +0200 Subject: [PATCH 2/3] 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 Date: Thu, 15 Aug 2024 11:41:07 +0200 Subject: [PATCH 3/3] 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 projection) : m_projection(std::move(projection)), m_maxzoom(max_zoom), - m_map_width(1U << m_maxzoom) + m_map_width(static_cast(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 */