Merge pull request #1895 from joto/update-libosmium

Upgrade included libosmium to version 2.19.0

Author: lonvia

contrib/libosmium/README.contrib

@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.17.3
+Revision: v2.19.0

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

@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -213,7 +213,7 @@ namespace osmium {
 
                 // Now create the Area object and add the attributes and tags
                 // from the relation.
-                bool okay = create_area(out_buffer, relation, members);
+                const bool okay = create_area(out_buffer, relation, members);
                 if (okay) {
                     out_buffer.commit();
                 } else {

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

@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -33,8 +33,6 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
-#include <osmium/util/compatibility.hpp>
-
 namespace osmium {
 
     namespace area {
@@ -126,25 +124,6 @@ namespace osmium {
 
             AssemblerConfig() noexcept = default;
 
-            /**
-             * Constructor
-             * @deprecated Use default constructor and set values afterwards.
-             */
-            explicit AssemblerConfig(ProblemReporter* pr, bool d = false) :
-                problem_reporter(pr),
-                debug_level(d) {
-            }
-
-            /**
-             * Enable or disable debug output to stderr. This is for Osmium
-             * developers only.
-             *
-             * @deprecated Set debug_level directly.
-             */
-            OSMIUM_DEPRECATED void enable_debug_output(bool d = true) {
-                debug_level = d;
-            }
-
         }; // struct AssemblerConfig
 
     } // namespace area

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

@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -332,10 +332,10 @@ namespace osmium {
                             if (!way.nodes().empty() && way.is_closed() && !way.tags().empty()) {
                                 const auto d = std::count_if(way.tags().cbegin(), way.tags().cend(), std::cref(filter()));
                                 if (d > 0) {
-                                    osmium::tags::KeyFilter::iterator way_fi_begin(std::cref(filter()), way.tags().cbegin(), way.tags().cend());
-                                    osmium::tags::KeyFilter::iterator way_fi_end(std::cref(filter()), way.tags().cend(), way.tags().cend());
-                                    osmium::tags::KeyFilter::iterator area_fi_begin(std::cref(filter()), area_tags.cbegin(), area_tags.cend());
-                                    osmium::tags::KeyFilter::iterator area_fi_end(std::cref(filter()), area_tags.cend(), area_tags.cend());
+                                    const osmium::tags::KeyFilter::iterator way_fi_begin(std::cref(filter()), way.tags().cbegin(), way.tags().cend());
+                                    const osmium::tags::KeyFilter::iterator way_fi_end(std::cref(filter()), way.tags().cend(), way.tags().cend());
+                                    const osmium::tags::KeyFilter::iterator area_fi_begin(std::cref(filter()), area_tags.cbegin(), area_tags.cend());
+                                    const osmium::tags::KeyFilter::iterator area_fi_end(std::cref(filter()), area_tags.cend(), area_tags.cend());
 #ifdef __cpp_lib_robust_nonmodifying_seq_ops
                                     if (!std::equal(way_fi_begin, way_fi_end, area_fi_begin, area_fi_end)) {
 #else

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-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -608,7 +608,7 @@ namespace osmium {
 
                 void create_rings_simple_case() {
                     auto count_remaining = m_segment_list.size();
-                    for (slocation& sl : m_locations) {
+                    for (const slocation& sl : m_locations) {
                         const NodeRefSegment& segment = m_segment_list[sl.item];
                         if (!segment.is_done()) {
                             count_remaining -= add_new_ring(sl);
@@ -671,7 +671,7 @@ namespace osmium {
                         std::cerr << "    Trying to merge " << open_ring_its.size() << " open rings (try_to_merge)\n";
                     }
 
-                    std::vector<location_to_ring_map> xrings = create_location_to_ring_map(open_ring_its);
+                    const auto xrings = create_location_to_ring_map(open_ring_its);
 
                     auto it = xrings.cbegin();
                     while (it != xrings.cend()) {
@@ -825,7 +825,7 @@ namespace osmium {
 
                     find_inner_outer_complex();
                     ProtoRing* outer_ring = find_enclosing_ring(ring_min->ring().min_segment());
-                    bool ring_min_is_outer = !outer_ring;
+                    const bool ring_min_is_outer = !outer_ring;
                     if (debug()) {
                         std::cerr << "  Open ring is " << (ring_min_is_outer ? "outer" : "inner") << " ring\n";
                     }
@@ -924,7 +924,7 @@ namespace osmium {
 
                     // Now find all the rest of the rings (ie not starting at split locations)
                     if (count_remaining > 0) {
-                        for (slocation& sl : m_locations) {
+                        for (const slocation& sl : m_locations) {
                             const NodeRefSegment& segment = m_segment_list[sl.item];
                             if (!segment.is_done()) {
                                 count_remaining -= add_new_ring_complex(sl);

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-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 

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-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -327,7 +327,7 @@ 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) / d;
+                        const double ua = double(na) / double(d);
                         const vec i = p0 + ua * (p1 - p0);
                         return osmium::Location{int32_t(i.x), int32_t(i.y)};
                     }

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-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 

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-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -333,7 +333,7 @@ namespace osmium {
                             }
 
                             if (y_range_overlap(s1, s2)) {
-                                osmium::Location intersection{calculate_intersection(s1, s2)};
+                                const osmium::Location intersection{calculate_intersection(s1, s2)};
                                 if (intersection) {
                                     ++found_intersections;
                                     if (m_debug) {

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

@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2022 Jochen Topf <[email protected]> and others (see README).
+Copyright 2013-2023 Jochen Topf <[email protected]> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -89,12 +89,12 @@ namespace osmium {
 
             // scale vector
             constexpr inline vec operator*(double s, const vec& v) noexcept {
-                return vec{int64_t(s * v.x), int64_t(s * v.y)};
+                return vec{int64_t(s * double(v.x)), int64_t(s * double(v.y))};
             }
 
             // scale vector
             constexpr inline vec operator*(const vec& v, double s) noexcept {
-                return vec{int64_t(s * v.x), int64_t(s * v.y)};
+                return vec{int64_t(s * double(v.x)), int64_t(s * double(v.y))};
             }
 
             // equality