Skip to content

Commit f900e2c

Browse files
lonvialonvia
authored
Merge pull request #2295 from joto/update-libosmium
Update included libosmium to version 2.21.0
2 parents 4d6bcb9 + 3161160 commit f900e2c

199 files changed

Lines changed: 478 additions & 655 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contrib/libosmium/README.contrib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Source: https://github.com/osmcode/libosmium
2-
Revision: v2.20.0
2+
Revision: v2.21.0

‎contrib/libosmium/include/osmium/area/assembler.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

‎contrib/libosmium/include/osmium/area/assembler_config.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

‎contrib/libosmium/include/osmium/area/assembler_legacy.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

‎contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -70,7 +70,7 @@ namespace osmium {
7070

7171
struct location_to_ring_map {
7272
osmium::Location location;
73-
open_ring_its_type::iterator ring_it{};
73+
open_ring_its_type::iterator ring_it;
7474
bool start{false};
7575

7676
location_to_ring_map(osmium::Location l, open_ring_its_type::iterator r, const bool s) noexcept :
@@ -217,7 +217,7 @@ namespace osmium {
217217
}
218218
}
219219

220-
for (const osmium::Way* way : ways_in_multiple_rings) {
220+
for (const osmium::Way* way : ways_in_multiple_rings) { // NOLINT(bugprone-nondeterministic-pointer-iteration-order)
221221
++m_stats.ways_in_multiple_rings;
222222
if (debug()) {
223223
std::cerr << " Way " << way->id() << " is in multiple rings\n";
@@ -326,7 +326,7 @@ namespace osmium {
326326
const int64_t ay = a.y();
327327
const int64_t by = b.y();
328328
const int64_t ly = end_location.y();
329-
const auto z = (bx - ax) * (ly - ay) - (by - ay) * (lx - ax);
329+
const auto z = ((bx - ax) * (ly - ay)) - ((by - ay) * (lx - ax));
330330
if (debug()) {
331331
std::cerr << " Segment z=" << z << '\n';
332332
}
@@ -353,7 +353,7 @@ namespace osmium {
353353
const int64_t ay = a.y();
354354
const int64_t by = b.y();
355355
const int64_t ly = location.y();
356-
const auto z = (bx - ax) * (ly - ay) - (by - ay) * (lx - ax);
356+
const auto z = ((bx - ax) * (ly - ay)) - ((by - ay) * (lx - ax));
357357

358358
if (z >= 0) {
359359
nesting += segment->is_reverse() ? -1 : 1;
@@ -362,7 +362,7 @@ namespace osmium {
362362
}
363363
if (segment->ring()->is_outer()) {
364364
const double y = static_cast<double>(ay) +
365-
static_cast<double>((by - ay) * (lx - ax)) / static_cast<double>(bx - ax);
365+
(static_cast<double>((by - ay) * (lx - ax)) / static_cast<double>(bx - ax));
366366
if (debug()) {
367367
std::cerr << " Segment belongs to outer ring (y=" << y << " ring=" << *segment->ring() << ")\n";
368368
}
@@ -703,7 +703,7 @@ namespace osmium {
703703

704704
struct candidate {
705705
int64_t sum;
706-
std::vector<std::pair<location_to_ring_map, bool>> rings{};
706+
std::vector<std::pair<location_to_ring_map, bool>> rings;
707707
osmium::Location start_location;
708708
osmium::Location stop_location;
709709

‎contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

‎contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -75,10 +75,10 @@ namespace osmium {
7575
class NodeRefSegment {
7676

7777
// First node in order described above.
78-
osmium::NodeRef m_first{};
78+
osmium::NodeRef m_first;
7979

8080
// Second node in order described above.
81-
osmium::NodeRef m_second{};
81+
osmium::NodeRef m_second;
8282

8383
// Way this segment was from.
8484
const osmium::Way* m_way = nullptr;
@@ -319,11 +319,11 @@ namespace osmium {
319319

320320
// intersection in a point
321321

322-
const int64_t na = (q1.x - q0.x) * (p0.y - q0.y) -
323-
(q1.y - q0.y) * (p0.x - q0.x);
322+
const int64_t na = ((q1.x - q0.x) * (p0.y - q0.y)) -
323+
((q1.y - q0.y) * (p0.x - q0.x));
324324

325-
const int64_t nb = (p1.x - p0.x) * (p0.y - q0.y) -
326-
(p1.y - p0.y) * (p0.x - q0.x);
325+
const int64_t nb = ((p1.x - p0.x) * (p0.y - q0.y)) -
326+
((p1.y - p0.y) * (p0.x - q0.x));
327327

328328
if ((d > 0 && na >= 0 && na <= d && nb >= 0 && nb <= d) ||
329329
(d < 0 && na <= 0 && na >= d && nb <= 0 && nb >= d)) {

‎contrib/libosmium/include/osmium/area/detail/proto_ring.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -64,11 +64,11 @@ namespace osmium {
6464
private:
6565

6666
// Segments in this ring.
67-
segments_type m_segments{};
67+
segments_type m_segments;
6868

6969
// If this is an outer ring, these point to it's inner rings
7070
// (if any).
71-
std::vector<ProtoRing*> m_inner{};
71+
std::vector<ProtoRing*> m_inner;
7272

7373
// The smallest segment. Will be kept current whenever a new
7474
// segment is added to the ring.

‎contrib/libosmium/include/osmium/area/detail/segment_list.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -84,7 +84,7 @@ namespace osmium {
8484

8585
using slist_type = std::vector<NodeRefSegment>;
8686

87-
slist_type m_segments{};
87+
slist_type m_segments;
8888

8989
bool m_debug;
9090

‎contrib/libosmium/include/osmium/area/detail/vector.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2025 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -73,37 +73,37 @@ namespace osmium {
7373
}; // struct vec
7474

7575
// addition
76-
constexpr inline vec operator+(const vec& lhs, const vec& rhs) noexcept {
76+
constexpr vec operator+(const vec& lhs, const vec& rhs) noexcept {
7777
return vec{lhs.x + rhs.x, lhs.y + rhs.y};
7878
}
7979

8080
// subtraction
81-
constexpr inline vec operator-(const vec& lhs, const vec& rhs) noexcept {
81+
constexpr vec operator-(const vec& lhs, const vec& rhs) noexcept {
8282
return vec{lhs.x - rhs.x, lhs.y - rhs.y};
8383
}
8484

8585
// cross product
86-
constexpr inline int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
87-
return lhs.x * rhs.y - lhs.y * rhs.x;
86+
constexpr int64_t operator*(const vec& lhs, const vec& rhs) noexcept {
87+
return (lhs.x * rhs.y) - (lhs.y * rhs.x);
8888
}
8989

9090
// scale vector
91-
constexpr inline vec operator*(double s, const vec& v) noexcept {
91+
constexpr vec operator*(double s, const vec& v) noexcept {
9292
return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
9393
}
9494

9595
// scale vector
96-
constexpr inline vec operator*(const vec& v, double s) noexcept {
96+
constexpr vec operator*(const vec& v, double s) noexcept {
9797
return vec{static_cast<int64_t>(s * static_cast<double>(v.x)), static_cast<int64_t>(s * static_cast<double>(v.y))};
9898
}
9999

100100
// equality
101-
constexpr inline bool operator==(const vec& lhs, const vec& rhs) noexcept {
101+
constexpr bool operator==(const vec& lhs, const vec& rhs) noexcept {
102102
return lhs.x == rhs.x && lhs.y == rhs.y;
103103
}
104104

105105
// inequality
106-
constexpr inline bool operator!=(const vec& lhs, const vec& rhs) noexcept {
106+
constexpr bool operator!=(const vec& lhs, const vec& rhs) noexcept {
107107
return !(lhs == rhs);
108108
}
109109

0 commit comments

Comments
 (0)