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

expose lanes as enums, adjusted for comments

Browse Source
This commit is contained in:
Moritz Kobitzsch
2016-06-21 10:41:08 +02:00
parent 5d91b759d1
commit 5905708111
45 changed files with 1020 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/extractor/graph_compressor.cpp
+34 -34
View File
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
0,
1,
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
2,
1,
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
1,
1,
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
3,
1,
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{3,
2,
1,
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{3,
4,
1,
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{4,
3,
1,
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID}};
INVALID_LANE_DESCRIPTIONID}};
BOOST_ASSERT(edges[0].data.IsCompatibleTo(edges[2].data));
BOOST_ASSERT(edges[2].data.IsCompatibleTo(edges[4].data));
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{0,
5,
1,
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
0,
1,
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
2,
1,
@@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
1,
1,
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
3,
1,
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{3,
2,
1,
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{3,
4,
1,
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{4,
3,
1,
@@ -247,7 +247,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{4,
5,
1,
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{5,
0,
1,
@@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{5,
4,
1,
@@ -280,7 +280,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
};
BOOST_ASSERT(edges.size() == 12);
@@ -334,7 +334,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
0,
1,
@@ -345,7 +345,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
2,
1,
@@ -356,7 +356,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
3,
1,
@@ -367,7 +367,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
1,
1,
@@ -378,7 +378,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{3,
1,
1,
@@ -389,7 +389,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
};
BOOST_ASSERT(edges[0].data.IsCompatibleTo(edges[1].data));
@@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
0,
1,
@@ -441,7 +441,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
2,
1,
@@ -452,7 +452,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
1,
1,
@@ -463,7 +463,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
};
BOOST_ASSERT(edges[0].data.IsCompatibleTo(edges[1].data));
@@ -500,7 +500,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
0,
1,
@@ -511,7 +511,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{1,
2,
1,
@@ -522,7 +522,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
{2,
1,
1,
@@ -533,7 +533,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
false,
true,
TRAVEL_MODE_INACCESSIBLE,
INVALID_LANE_STRINGID},
INVALID_LANE_DESCRIPTIONID},
};
Graph graph(5, edges);
unit_tests/mocks/mock_datafacade.hpp
+11 -3
View File
@@ -5,6 +5,7 @@
#include "contractor/query_edge.hpp"
#include "extractor/guidance/turn_instruction.hpp"
#include "extractor/guidance/turn_lane_types.hpp"
#include "engine/datafacade/datafacade_base.hpp"
#include "util/guidance/bearing_class.hpp"
#include "util/guidance/entry_class.hpp"
@@ -180,9 +181,16 @@ class MockDataFacade final : public engine::datafacade::BaseDataFacade
BearingClassID GetBearingClassID(const NodeID /*id*/) const override { return 0; };
EntryClassID GetEntryClassID(const EdgeID /*id*/) const override { return 0; }
bool hasLaneData(const EdgeID /*id*/) const { return true; };
util::guidance::LaneTupelIdPair GetLaneData(const EdgeID /*id*/) const { return {{0, 0}, 0}; }
std::string GetTurnStringForID(const LaneStringID /*lane_string_id*/) const { return ""; };
bool hasLaneData(const EdgeID /*id*/) const override final { return true; };
util::guidance::LaneTupelIdPair GetLaneData(const EdgeID /*id*/) const override final
{
return {{0, 0}, 0};
}
extractor::guidance::TurnLaneDescription
GetTurnDescription(const LaneDescriptionID /*lane_description_id*/) const override final
{
return {};
}
util::guidance::BearingClass
GetBearingClass(const BearingClassID /*bearing_class_id*/) const override