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

Support maneuver relations (#4676)

Browse Source
This commit is contained in:
Daniel Patterson
2018-02-10 05:32:09 +11:00
committed by GitHub
parent 1aed13500d
commit 5531cace7f
46 changed files with 1474 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/extractor/graph_compressor.cpp
+11
View File
@@ -1,5 +1,6 @@
#include "extractor/graph_compressor.hpp"
#include "extractor/compressed_edge_container.hpp"
#include "extractor/maneuver_override.hpp"
#include "extractor/restriction.hpp"
#include "util/node_based_graph.hpp"
#include "util/typedefs.hpp"
@@ -71,6 +72,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
std::vector<NodeBasedEdgeAnnotation> annotations(1);
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
std::vector<InputEdge> edges = {MakeUnitEdge(0, 1),
MakeUnitEdge(1, 0),
@@ -91,6 +93,7 @@ BOOST_AUTO_TEST_CASE(long_road_test)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -117,6 +120,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
CompressedEdgeContainer container;
std::vector<NodeBasedEdgeAnnotation> annotations(1);
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
std::vector<InputEdge> edges = {MakeUnitEdge(0, 1),
MakeUnitEdge(0, 5),
@@ -151,6 +155,7 @@ BOOST_AUTO_TEST_CASE(loop_test)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -180,6 +185,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
std::vector<InputEdge> edges = {MakeUnitEdge(0, 1),
MakeUnitEdge(1, 0),
@@ -200,6 +206,7 @@ BOOST_AUTO_TEST_CASE(t_intersection)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -223,6 +230,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
std::vector<InputEdge> edges = {
MakeUnitEdge(0, 1), MakeUnitEdge(1, 0), MakeUnitEdge(1, 2), MakeUnitEdge(2, 1)};
@@ -239,6 +247,7 @@ BOOST_AUTO_TEST_CASE(street_name_changes)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -261,6 +270,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
std::vector<InputEdge> edges = {
MakeUnitEdge(0, 1), MakeUnitEdge(1, 0), MakeUnitEdge(1, 2), MakeUnitEdge(2, 1)};
@@ -273,6 +283,7 @@ BOOST_AUTO_TEST_CASE(direction_changes)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
unit_tests/extractor/intersection_analysis_tests.cpp
+6
View File
@@ -28,6 +28,7 @@ BOOST_AUTO_TEST_CASE(simple_intersection_connectivity)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
TurnLanesIndexedArray turn_lanes_data{{0, 0, 3},
{TurnLaneType::uturn | TurnLaneType::left,
@@ -90,6 +91,7 @@ BOOST_AUTO_TEST_CASE(simple_intersection_connectivity)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -157,6 +159,7 @@ BOOST_AUTO_TEST_CASE(roundabout_intersection_connectivity)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
TurnLanesIndexedArray turn_lanes_data;
@@ -211,6 +214,7 @@ BOOST_AUTO_TEST_CASE(roundabout_intersection_connectivity)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);
@@ -261,6 +265,7 @@ BOOST_AUTO_TEST_CASE(skip_degree_two_nodes)
std::vector<ConditionalTurnRestriction> conditional_restrictions;
CompressedEdgeContainer container;
test::MockScriptingEnvironment scripting_environment;
std::vector<UnresolvedManeuverOverride> maneuver_overrides;
TurnLanesIndexedArray turn_lanes_data;
@@ -301,6 +306,7 @@ BOOST_AUTO_TEST_CASE(skip_degree_two_nodes)
scripting_environment,
restrictions,
conditional_restrictions,
maneuver_overrides,
graph,
annotations,
container);