Merge commit '879f7eb04200d7d2c28af565229bf6e3d54274fd' into retry/libosmium

third_party/libosmium/include/osmium/handler/chain.hpp

@@ -67,7 +67,7 @@ namespace osmium {
         template <typename... THandler>
         class ChainHandler : public osmium::handler::Handler {
 
-            typedef std::tuple<THandler&...> handlers_type;
+            using handlers_type = std::tuple<THandler&...>;
             handlers_type m_handlers;
 
             template <int N, int SIZE, typename THandlers>

third_party/libosmium/include/osmium/handler/check_order.hpp

@@ -51,11 +51,11 @@ namespace osmium {
      */
     struct out_of_order_error : public std::runtime_error {
 
-        out_of_order_error(const std::string& what) :
+        explicit out_of_order_error(const std::string& what) :
             std::runtime_error(what) {
         }
 
-        out_of_order_error(const char* what) :
+        explicit out_of_order_error(const char* what) :
             std::runtime_error(what) {
         }
 

third_party/libosmium/include/osmium/handler/disk_store.hpp

@@ -57,7 +57,7 @@ namespace osmium {
          */
         class DiskStore : public osmium::handler::Handler {
 
-            typedef osmium::index::map::Map<unsigned_object_id_type, size_t> offset_index_type;
+            using offset_index_type = osmium::index::map::Map<unsigned_object_id_type, size_t>;
 
             size_t m_offset = 0;
             int m_data_fd;

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

@@ -33,6 +33,7 @@ DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <limits>
 #include <type_traits>
 
 #include <osmium/handler.hpp>
@@ -50,7 +51,7 @@ namespace osmium {
 
     namespace handler {
 
-        typedef osmium::index::map::Dummy<osmium::unsigned_object_id_type, osmium::Location> dummy_type;
+        using dummy_type = osmium::index::map::Dummy<osmium::unsigned_object_id_type, osmium::Location>;
 
         /**
          * Handler to retrieve locations from nodes and add them to ways.
@@ -69,8 +70,8 @@ namespace osmium {
 
         public:
 
-            typedef TStoragePosIDs index_pos_type;
-            typedef TStorageNegIDs index_neg_type;
+            using index_pos_type = TStoragePosIDs;
+            using index_neg_type = TStorageNegIDs;
 
         private:
 
@@ -80,6 +81,8 @@ namespace osmium {
             /// Object that handles the actual storage of the node locations (with negative IDs).
             TStorageNegIDs& m_storage_neg;
 
+            osmium::unsigned_object_id_type m_last_id{0};
+
             bool m_ignore_errors {false};
 
             bool m_must_sort {false};
@@ -115,7 +118,11 @@ namespace osmium {
              * Store the location of the node in the storage.
              */
             void node(const osmium::Node& node) {
-                m_must_sort = true;
+                if (node.positive_id() < m_last_id) {
+                    m_must_sort = true;
+                }
+                m_last_id = node.positive_id();
+
                 const osmium::object_id_type id = node.id();
                 if (id >= 0) {
                     m_storage_pos.set(static_cast<osmium::unsigned_object_id_type>( id), node.location());
@@ -144,6 +151,7 @@ namespace osmium {
                     m_storage_pos.sort();
                     m_storage_neg.sort();
                     m_must_sort = false;
+                    m_last_id = std::numeric_limits<osmium::unsigned_object_id_type>::max();
                 }
                 bool error = false;
                 for (auto& node_ref : way.nodes()) {
@@ -152,7 +160,7 @@ namespace osmium {
                         if (!node_ref.location()) {
                             error = true;
                         }
-                    } catch (osmium::not_found&) {
+                    } catch (const osmium::not_found&) {
                         error = true;
                     }
                 }

third_party/libosmium/include/osmium/handler/object_relations.hpp

@@ -52,7 +52,7 @@ namespace osmium {
          */
         class ObjectRelations : public osmium::handler::Handler {
 
-            typedef osmium::index::multimap::Multimap<unsigned_object_id_type, unsigned_object_id_type> index_type;
+            using index_type = osmium::index::multimap::Multimap<unsigned_object_id_type, unsigned_object_id_type>;
 
             index_type& m_index_n2w;
             index_type& m_index_n2r;