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

Merge commit 'bb78bc8fe305eef39ca0a5d5e9dedc466f803dfb' into develop

Browse Source
This commit is contained in:
Dennis Luxen
2015-02-05 15:13:48 +01:00
parent 3eb83d0737 bb78bc8fe3
commit 10224a692b
215 changed files with 2699 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/test/t/basic/test_box.cpp
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ SECTION("output_defined") {
std::stringstream out;
out << b;
REQUIRE(out.str() == "(1.2,3.4,5.6,7.8)");
REQUIRE((19.36 - b.size()) < 0.000001);
REQUIRE(b.size() == Approx(19.36).epsilon(0.000001));
}
SECTION("output_undefined") {
third_party/libosmium/test/t/basic/test_entity_bits.cpp
Vendored
+6
View File
@@ -20,6 +20,12 @@ SECTION("can_be_set_and_checked") {
REQUIRE((entities & osmium::osm_entity_bits::node));
REQUIRE(! (entities & osmium::osm_entity_bits::way));
REQUIRE(entities == osmium::osm_entity_bits::node);
REQUIRE(osmium::osm_entity_bits::node == osmium::osm_entity_bits::from_item_type(osmium::item_type::node));
REQUIRE(osmium::osm_entity_bits::way == osmium::osm_entity_bits::from_item_type(osmium::item_type::way));
REQUIRE(osmium::osm_entity_bits::relation == osmium::osm_entity_bits::from_item_type(osmium::item_type::relation));
REQUIRE(osmium::osm_entity_bits::changeset == osmium::osm_entity_bits::from_item_type(osmium::item_type::changeset));
REQUIRE(osmium::osm_entity_bits::area == osmium::osm_entity_bits::from_item_type(osmium::item_type::area));
}
}
third_party/libosmium/test/t/basic/test_node.cpp
Vendored
+3
View File
@@ -21,6 +21,9 @@ SECTION("node_builder") {
.set_uid(21)
.set_timestamp(123);
REQUIRE(osmium::item_type::node == node.type());
REQUIRE(node.type_is_in(osmium::osm_entity_bits::node));
REQUIRE(node.type_is_in(osmium::osm_entity_bits::nwr));
REQUIRE(17l == node.id());
REQUIRE(17ul == node.positive_id());
REQUIRE(3 == node.version());
third_party/libosmium/test/t/basic/test_object_comparisons.cpp
Vendored
+11 -11
View File
@@ -31,20 +31,20 @@ SECTION("order") {
node1.set_version(1);
node2.set_id(15);
node2.set_version(2);
REQUIRE(true == node1 < node2);
REQUIRE(false == node1 > node2);
REQUIRE(true == (node1 < node2));
REQUIRE(false == (node1 > node2));
node1.set_id(20);
node1.set_version(1);
node2.set_id(20);
node2.set_version(2);
REQUIRE(true == node1 < node2);
REQUIRE(false == node1 > node2);
REQUIRE(true == (node1 < node2));
REQUIRE(false == (node1 > node2));
node1.set_id(-10);
node1.set_version(2);
node2.set_id(-15);
node2.set_version(1);
REQUIRE(true == node1 < node2);
REQUIRE(false == node1 > node2);
REQUIRE(true == (node1 < node2));
REQUIRE(false == (node1 > node2));
}
SECTION("order_types") {
@@ -122,11 +122,11 @@ SECTION("order_types") {
const osmium::Way& way = static_cast<const osmium::Way&>(*(++it));
const osmium::Relation& relation = static_cast<const osmium::Relation&>(*(++it));
REQUIRE(true == node1 < node2);
REQUIRE(true == node2 < way);
REQUIRE(false == node2 > way);
REQUIRE(true == way < relation);
REQUIRE(true == node1 < relation);
REQUIRE(true == (node1 < node2));
REQUIRE(true == (node2 < way));
REQUIRE(false == (node2 > way));
REQUIRE(true == (way < relation));
REQUIRE(true == (node1 < relation));
REQUIRE(true == osmium::object_order_type_id_version()(node1, node2));
REQUIRE(true == osmium::object_order_type_id_reverse_version()(node2, node1));
third_party/libosmium/test/t/basic/test_way.cpp
Vendored
+3
View File
@@ -22,6 +22,9 @@ SECTION("way_builder") {
.set_uid(21)
.set_timestamp(123);
REQUIRE(osmium::item_type::way == way.type());
REQUIRE(way.type_is_in(osmium::osm_entity_bits::way));
REQUIRE(way.type_is_in(osmium::osm_entity_bits::node | osmium::osm_entity_bits::way));
REQUIRE(17 == way.id());
REQUIRE(3 == way.version());
REQUIRE(true == way.visible());