Skip to content

Commit 0100c32

Browse files
jotojoto
committed
Upgrade included libosmium to version 2.19.0
1 parent 563111c commit 0100c32

199 files changed

Lines changed: 288 additions & 529 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.17.3
2+
Revision: v2.19.0

‎contrib/libosmium/include/osmium/area/assembler.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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -213,7 +213,7 @@ namespace osmium {
213213

214214
// Now create the Area object and add the attributes and tags
215215
// from the relation.
216-
bool okay = create_area(out_buffer, relation, members);
216+
const bool okay = create_area(out_buffer, relation, members);
217217
if (okay) {
218218
out_buffer.commit();
219219
} else {

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

Lines changed: 1 addition & 22 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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -33,8 +33,6 @@ DEALINGS IN THE SOFTWARE.
3333
3434
*/
3535

36-
#include <osmium/util/compatibility.hpp>
37-
3836
namespace osmium {
3937

4038
namespace area {
@@ -126,25 +124,6 @@ namespace osmium {
126124

127125
AssemblerConfig() noexcept = default;
128126

129-
/**
130-
* Constructor
131-
* @deprecated Use default constructor and set values afterwards.
132-
*/
133-
explicit AssemblerConfig(ProblemReporter* pr, bool d = false) :
134-
problem_reporter(pr),
135-
debug_level(d) {
136-
}
137-
138-
/**
139-
* Enable or disable debug output to stderr. This is for Osmium
140-
* developers only.
141-
*
142-
* @deprecated Set debug_level directly.
143-
*/
144-
OSMIUM_DEPRECATED void enable_debug_output(bool d = true) {
145-
debug_level = d;
146-
}
147-
148127
}; // struct AssemblerConfig
149128

150129
} // namespace area

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

Lines changed: 5 additions & 5 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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -332,10 +332,10 @@ namespace osmium {
332332
if (!way.nodes().empty() && way.is_closed() && !way.tags().empty()) {
333333
const auto d = std::count_if(way.tags().cbegin(), way.tags().cend(), std::cref(filter()));
334334
if (d > 0) {
335-
osmium::tags::KeyFilter::iterator way_fi_begin(std::cref(filter()), way.tags().cbegin(), way.tags().cend());
336-
osmium::tags::KeyFilter::iterator way_fi_end(std::cref(filter()), way.tags().cend(), way.tags().cend());
337-
osmium::tags::KeyFilter::iterator area_fi_begin(std::cref(filter()), area_tags.cbegin(), area_tags.cend());
338-
osmium::tags::KeyFilter::iterator area_fi_end(std::cref(filter()), area_tags.cend(), area_tags.cend());
335+
const osmium::tags::KeyFilter::iterator way_fi_begin(std::cref(filter()), way.tags().cbegin(), way.tags().cend());
336+
const osmium::tags::KeyFilter::iterator way_fi_end(std::cref(filter()), way.tags().cend(), way.tags().cend());
337+
const osmium::tags::KeyFilter::iterator area_fi_begin(std::cref(filter()), area_tags.cbegin(), area_tags.cend());
338+
const osmium::tags::KeyFilter::iterator area_fi_end(std::cref(filter()), area_tags.cend(), area_tags.cend());
339339
#ifdef __cpp_lib_robust_nonmodifying_seq_ops
340340
if (!std::equal(way_fi_begin, way_fi_end, area_fi_begin, area_fi_end)) {
341341
#else

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

Lines changed: 5 additions & 5 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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -608,7 +608,7 @@ namespace osmium {
608608

609609
void create_rings_simple_case() {
610610
auto count_remaining = m_segment_list.size();
611-
for (slocation& sl : m_locations) {
611+
for (const slocation& sl : m_locations) {
612612
const NodeRefSegment& segment = m_segment_list[sl.item];
613613
if (!segment.is_done()) {
614614
count_remaining -= add_new_ring(sl);
@@ -671,7 +671,7 @@ namespace osmium {
671671
std::cerr << " Trying to merge " << open_ring_its.size() << " open rings (try_to_merge)\n";
672672
}
673673

674-
std::vector<location_to_ring_map> xrings = create_location_to_ring_map(open_ring_its);
674+
const auto xrings = create_location_to_ring_map(open_ring_its);
675675

676676
auto it = xrings.cbegin();
677677
while (it != xrings.cend()) {
@@ -825,7 +825,7 @@ namespace osmium {
825825

826826
find_inner_outer_complex();
827827
ProtoRing* outer_ring = find_enclosing_ring(ring_min->ring().min_segment());
828-
bool ring_min_is_outer = !outer_ring;
828+
const bool ring_min_is_outer = !outer_ring;
829829
if (debug()) {
830830
std::cerr << " Open ring is " << (ring_min_is_outer ? "outer" : "inner") << " ring\n";
831831
}
@@ -924,7 +924,7 @@ namespace osmium {
924924

925925
// Now find all the rest of the rings (ie not starting at split locations)
926926
if (count_remaining > 0) {
927-
for (slocation& sl : m_locations) {
927+
for (const slocation& sl : m_locations) {
928928
const NodeRefSegment& segment = m_segment_list[sl.item];
929929
if (!segment.is_done()) {
930930
count_remaining -= add_new_ring_complex(sl);

‎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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 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: 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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -327,7 +327,7 @@ namespace osmium {
327327

328328
if ((d > 0 && na >= 0 && na <= d && nb >= 0 && nb <= d) ||
329329
(d < 0 && na <= 0 && na >= d && nb <= 0 && nb >= d)) {
330-
const double ua = double(na) / d;
330+
const double ua = double(na) / double(d);
331331
const vec i = p0 + ua * (p1 - p0);
332332
return osmium::Location{int32_t(i.x), int32_t(i.y)};
333333
}

‎contrib/libosmium/include/osmium/area/detail/proto_ring.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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 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/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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -333,7 +333,7 @@ namespace osmium {
333333
}
334334

335335
if (y_range_overlap(s1, s2)) {
336-
osmium::Location intersection{calculate_intersection(s1, s2)};
336+
const osmium::Location intersection{calculate_intersection(s1, s2)};
337337
if (intersection) {
338338
++found_intersections;
339339
if (m_debug) {

‎contrib/libosmium/include/osmium/area/detail/vector.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-2022 Jochen Topf <jochen@topf.org> and others (see README).
8+
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111
@@ -89,12 +89,12 @@ namespace osmium {
8989

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

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

100100
// equality

0 commit comments

Comments
 (0)