Merge pull request #1474 from joto/libosmium-2.17

Update the vendored-in libosmium to version 2.17.0

Author: lonvia

contrib/libosmium/README.contrib

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

contrib/libosmium/README.md

@@ -4,9 +4,9 @@ https://osmcode.org/libosmium
 
 A fast and flexible C++ library for working with OpenStreetMap data.
 
-Libosmium works on Linux, Mac OSX and Windows.
+Libosmium works on Linux, macOS and Windows.
 
-[![Travis Build Status](https://secure.travis-ci.org/osmcode/libosmium.svg)](https://travis-ci.org/osmcode/libosmium)
+[![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)

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

@@ -408,7 +408,7 @@ namespace osmium {
                     return std::find(m_split_locations.cbegin(), m_split_locations.cend(), location) != m_split_locations.cend();
                 }
 
-                uint32_t add_new_ring(slocation& node) {
+                uint32_t add_new_ring(const slocation& node) {
                     NodeRefSegment* segment = &m_segment_list[node.item];
                     assert(!segment->is_done());
 
@@ -466,7 +466,7 @@ namespace osmium {
                     return nodes;
                 }
 
-                uint32_t add_new_ring_complex(slocation& node) {
+                uint32_t add_new_ring_complex(const slocation& node) {
                     NodeRefSegment* segment = &m_segment_list[node.item];
                     assert(!segment->is_done());
 
@@ -869,9 +869,9 @@ namespace osmium {
 
                     if (debug()) {
                         std::cerr << "    Found candidates:\n";
-                        for (const auto& cand : candidates) {
-                            std::cerr << "      sum=" << cand.sum << "\n";
-                            for (const auto& ring : cand.rings) {
+                        for (const auto& c : candidates) {
+                            std::cerr << "      sum=" << c.sum << "\n";
+                            for (const auto& ring : c.rings) {
                                 std::cerr << "        " << ring.first.ring() << (ring.second ? " reverse" : "") << "\n";
                             }
                         }

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

@@ -172,7 +172,7 @@ namespace osmium {
                 }
             }
 
-            void complete_relation(osmium::relations::RelationMeta& relation_meta) {
+            void complete_relation(const osmium::relations::RelationMeta& relation_meta) {
                 const osmium::Relation& relation = this->get_relation(relation_meta);
                 const osmium::memory::Buffer& buffer = this->members_buffer();
 

contrib/libosmium/include/osmium/builder/osm_object_builder.hpp

@@ -411,7 +411,7 @@ namespace osmium {
                 Builder(buffer, parent, sizeof(T) + min_size_for_user) {
                 new (&item()) T{};
                 add_size(min_size_for_user);
-                std::fill_n(object().data() + sizeof(T), min_size_for_user, 0);
+                std::memset(object().data() + sizeof(T), 0, min_size_for_user);
                 object().set_user_size(1);
             }
 
@@ -447,13 +447,13 @@ namespace osmium {
                 const auto size_of_object = sizeof(T) + sizeof(string_size_type);
                 assert(cobject().user_size() == 1 && (size() <= size_of_object + osmium::memory::padded_length(1))
                        && "set_user() must be called at most once and before any sub-builders");
-                const auto available_space = min_size_for_user - sizeof(string_size_type) - 1;
+                constexpr const auto available_space = min_size_for_user - sizeof(string_size_type) - 1;
                 if (length > available_space) {
                     const auto space_needed = osmium::memory::padded_length(length - available_space);
-                    std::fill_n(reserve_space(space_needed), space_needed, 0);
+                    std::memset(reserve_space(space_needed), 0, space_needed);
                     add_size(static_cast<uint32_t>(space_needed));
                 }
-                std::copy_n(user, length, object().data() + size_of_object);
+                std::memcpy(object().data() + size_of_object, user, length);
                 object().set_user_size(length + 1);
 
                 return static_cast<TDerived&>(*this);
@@ -608,7 +608,7 @@ namespace osmium {
                 Builder(buffer, parent, sizeof(Changeset) + min_size_for_user) {
                 new (&item()) Changeset{};
                 add_size(min_size_for_user);
-                std::fill_n(object().data() + sizeof(Changeset), min_size_for_user, 0);
+                std::memset(object().data() + sizeof(Changeset), 0, min_size_for_user);
                 object().set_user_size(1);
             }
 
@@ -663,13 +663,13 @@ namespace osmium {
             ChangesetBuilder& set_user(const char* user, const string_size_type length) {
                 assert(cobject().user_size() == 1 && (size() <= sizeof(Changeset) + osmium::memory::padded_length(1))
                        && "set_user() must be called at most once and before any sub-builders");
-                const auto available_space = min_size_for_user - 1;
+                constexpr const auto available_space = min_size_for_user - 1;
                 if (length > available_space) {
                     const auto space_needed = osmium::memory::padded_length(length - available_space);
-                    std::fill_n(reserve_space(space_needed), space_needed, 0);
+                    std::memset(reserve_space(space_needed), 0, space_needed);
                     add_size(static_cast<uint32_t>(space_needed));
                 }
-                std::copy_n(user, length, object().data() + sizeof(Changeset));
+                std::memcpy(object().data() + sizeof(Changeset), user, length);
                 object().set_user_size(length + 1);
 
                 return *this;

contrib/libosmium/include/osmium/geom/coordinates.hpp

@@ -74,6 +74,7 @@ namespace osmium {
              * This constructor is not explicit on purpose allowing use of
              * a Location everywhere a Coordinates object is needed.
              */
+            // cppcheck-suppress noExplicitConstructor
             Coordinates(const osmium::Location& location) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
                 x(location.lon()),
                 y(location.lat()) {

contrib/libosmium/include/osmium/geom/projection.hpp

@@ -122,7 +122,6 @@ namespace osmium {
          *
          * @deprecated Only supports the old PROJ API.
          */
-        // cppcheck-suppress passedByValue (because c is small and we want to change it)
         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) {

contrib/libosmium/include/osmium/geom/wkb.hpp

@@ -201,6 +201,34 @@ namespace osmium {
                     return data;
                 }
 
+                /* Polygon */
+
+                void polygon_start() {
+                    m_data.clear();
+                    set_size(header(m_data, wkbPolygon, true), 1);
+                    m_ring_size_offset = m_data.size();
+                    str_push(m_data, static_cast<uint32_t>(0));
+                }
+
+                void polygon_add_location(const osmium::geom::Coordinates& xy) {
+                    str_push(m_data, xy.x);
+                    str_push(m_data, xy.y);
+                }
+
+                polygon_type polygon_finish(std::size_t num_points) {
+                    set_size(m_ring_size_offset, num_points);
+                    std::string data;
+
+                    using std::swap;
+                    swap(data, m_data);
+
+                    if (m_out_type == out_type::hex) {
+                        return convert_to_hex(data);
+                    }
+
+                    return data;
+                }
+
                 /* MultiPolygon */
 
                 void multipolygon_start() {

contrib/libosmium/include/osmium/handler/node_locations_for_ways.hpp

@@ -115,6 +115,14 @@ namespace osmium {
                 m_ignore_errors = true;
             }
 
+            TStoragePosIDs& storage_pos() noexcept {
+                return m_storage_pos;
+            }
+
+            TStorageNegIDs& storage_neg() noexcept {
+                return m_storage_neg;
+            }
+
             /**
              * Store the location of the node in the storage.
              */

contrib/libosmium/include/osmium/index/detail/vector_multimap.hpp

@@ -61,7 +61,7 @@ namespace osmium {
 
                 vector_type m_vector;
 
-                static bool is_removed(element_type& element) {
+                static bool is_removed(const element_type& element) {
                     return element.second == osmium::index::empty_value<TValue>();
                 }