Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge commit 'a3a7a822e136d2357660d85124d8e7bb26ea6f7c' into subtrees-protozero-vtzero

Browse Source
This commit is contained in:
Michael Krasnyk
2018-04-19 22:03:25 +03:00
parent c7d22c2b92 a3a7a822e1
commit 3a9acde2c3
353 changed files with 6183 additions and 7253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/handler/chain.hpp
Vendored
+3 -3
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,10 +33,10 @@ DEALINGS IN THE SOFTWARE.
*/
#include <tuple>
#include <osmium/handler.hpp>
#include <tuple>
#define OSMIUM_CHAIN_HANDLER_CALL(_func_, _type_) \
template <int N, int SIZE, typename THandlers> \
struct call_ ## _func_ { \
third_party/libosmium/include/osmium/handler/check_order.hpp
Vendored
+5 -5
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,10 +33,6 @@ DEALINGS IN THE SOFTWARE.
*/
#include <limits>
#include <stdexcept>
#include <string>
#include <osmium/handler.hpp>
#include <osmium/osm/node.hpp>
#include <osmium/osm/object_comparisons.hpp>
@@ -44,6 +40,10 @@ DEALINGS IN THE SOFTWARE.
#include <osmium/osm/types.hpp>
#include <osmium/osm/way.hpp>
#include <limits>
#include <stdexcept>
#include <string>
namespace osmium {
/**
third_party/libosmium/include/osmium/handler/disk_store.hpp
Vendored
+3 -8
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,8 +33,6 @@ DEALINGS IN THE SOFTWARE.
*/
#include <cstddef>
#include <osmium/handler.hpp>
#include <osmium/index/map.hpp>
#include <osmium/io/detail/read_write.hpp>
@@ -46,6 +44,8 @@ DEALINGS IN THE SOFTWARE.
#include <osmium/osm/way.hpp>
#include <osmium/visitor.hpp>
#include <cstddef>
namespace osmium {
namespace handler {
@@ -78,11 +78,6 @@ namespace osmium {
m_relation_index(relation_index) {
}
DiskStore(const DiskStore&) = delete;
DiskStore& operator=(const DiskStore&) = delete;
~DiskStore() noexcept = default;
void node(const osmium::Node& node) {
m_node_index.set(node.positive_id(), m_offset);
m_offset += node.byte_size();
third_party/libosmium/include/osmium/handler/dump.hpp
Vendored
+7 -7
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,10 +33,6 @@ DEALINGS IN THE SOFTWARE.
*/
#include <iomanip>
#include <iostream>
#include <string>
#include <osmium/handler.hpp>
#include <osmium/memory/collection.hpp>
#include <osmium/memory/item.hpp>
@@ -54,6 +50,10 @@ DEALINGS IN THE SOFTWARE.
#include <osmium/osm/way.hpp>
#include <osmium/visitor.hpp>
#include <iomanip>
#include <iostream>
#include <string>
namespace osmium {
namespace handler {
@@ -136,10 +136,10 @@ namespace osmium {
public:
explicit Dump(std::ostream& out, bool with_size = true, const std::string& prefix = "") :
explicit Dump(std::ostream& out, bool with_size = true, std::string prefix = "") :
m_out(&out),
m_with_size(with_size),
m_prefix(prefix) {
m_prefix(std::move(prefix)) {
}
void tag_list(const osmium::TagList& tags) {
third_party/libosmium/include/osmium/handler/node_locations_for_ways.hpp
Vendored
+9 -11
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,19 +33,18 @@ DEALINGS IN THE SOFTWARE.
*/
#include <limits>
#include <type_traits>
#include <osmium/handler.hpp>
#include <osmium/index/index.hpp>
#include <osmium/index/map/dummy.hpp>
#include <osmium/index/node_locations_map.hpp>
#include <osmium/osm/location.hpp>
#include <osmium/osm/node.hpp>
#include <osmium/osm/node_ref.hpp>
#include <osmium/osm/types.hpp>
#include <osmium/osm/way.hpp>
#include <osmium/index/node_locations_map.hpp>
#include <limits>
#include <type_traits>
namespace osmium {
@@ -99,7 +98,7 @@ namespace osmium {
public:
explicit NodeLocationsForWays(TStoragePosIDs& storage_pos,
TStorageNegIDs& storage_neg = get_dummy()) :
TStorageNegIDs& storage_neg = get_dummy()) noexcept :
m_storage_pos(storage_pos),
m_storage_neg(storage_neg) {
}
@@ -107,8 +106,8 @@ namespace osmium {
NodeLocationsForWays(const NodeLocationsForWays&) = delete;
NodeLocationsForWays& operator=(const NodeLocationsForWays&) = delete;
NodeLocationsForWays(NodeLocationsForWays&&) = default;
NodeLocationsForWays& operator=(NodeLocationsForWays&&) = default;
NodeLocationsForWays(NodeLocationsForWays&&) noexcept = default;
NodeLocationsForWays& operator=(NodeLocationsForWays&&) noexcept = default;
~NodeLocationsForWays() noexcept = default;
@@ -138,10 +137,9 @@ namespace osmium {
*/
osmium::Location get_node_location(const osmium::object_id_type id) const {
if (id >= 0) {
return m_storage_pos.get_noexcept(static_cast<osmium::unsigned_object_id_type>( id));
} else {
return m_storage_neg.get_noexcept(static_cast<osmium::unsigned_object_id_type>(-id));
return m_storage_pos.get_noexcept(static_cast<osmium::unsigned_object_id_type>(id));
}
return m_storage_neg.get_noexcept(static_cast<osmium::unsigned_object_id_type>(-id));
}
/**
third_party/libosmium/include/osmium/handler/object_relations.hpp
Vendored
+2 -7
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -35,8 +35,8 @@ DEALINGS IN THE SOFTWARE.
#include <osmium/handler.hpp>
#include <osmium/index/multimap.hpp>
#include <osmium/osm/node_ref.hpp>
#include <osmium/osm/item_type.hpp>
#include <osmium/osm/node_ref.hpp>
#include <osmium/osm/relation.hpp>
#include <osmium/osm/types.hpp>
#include <osmium/osm/way.hpp>
@@ -70,11 +70,6 @@ namespace osmium {
m_index_r2r(r2r) {
}
ObjectRelations(const ObjectRelations&) = delete;
ObjectRelations& operator=(const ObjectRelations&) = delete;
~ObjectRelations() noexcept = default;
void way(const osmium::Way& way) {
for (const auto& node_ref : way.nodes()) {
m_index_n2w.set(node_ref.positive_ref(), way.positive_id());