Fix NoRoute for waypoints with low reachability edges #2914
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #include "gurka.h" | ||
|
There was a problem hiding this comment. nit: there is already a |
||
| #include <gtest/gtest.h> | ||
|
|
||
| using namespace valhalla; | ||
|
|
||
| TEST(Reachability, dont_snap_waypoints_to_deadends) { | ||
| const std::string ascii_map = R"( | ||
| A--1-B-2--C | ||
| / \ | ||
| D E)"; | ||
|
|
||
| // BD and BE are oneways that lead away, and toward the main road A-B-C | ||
| const gurka::ways ways = {{"AB", {{"highway", "primary"}}}, | ||
| {"BC", {{"highway", "primary"}}}, | ||
| {"BD", {{"highway", "secondary"}, {"oneway", "yes"}}}, | ||
| {"BE", {{"highway", "secondary"}, {"oneway", "yes"}}}}; | ||
| const auto layout = gurka::detail::map_to_coordinates(ascii_map, 25); | ||
|
|
||
| std::unordered_map<std::string, std::string> config_opts = { | ||
| {"mjolnir.concurrency", "1"}, | ||
| {"loki.service_defaults.minimum_reachability", "3"}, | ||
| }; | ||
|
|
||
| auto map = gurka::buildtiles(layout, ways, {}, {}, "test/data/reachability", config_opts); | ||
|
|
||
| { | ||
| // Verify simple waypoint routing works | ||
| auto result1 = gurka::do_action(valhalla::Options::route, map, {"A", "1", "C"}, "auto", {}, {}, | ||
| nullptr, "break_through"); | ||
| gurka::assert::raw::expect_path(result1, {"AB", "AB", "AB", "BC"}); | ||
| auto result2 = gurka::do_action(valhalla::Options::route, map, {"A", "2", "C"}, "auto", {}, {}, | ||
| nullptr, "break_through"); | ||
| gurka::assert::raw::expect_path(result2, {"AB", "BC", "BC"}); | ||
| } | ||
| { | ||
| // BD is a oneway leading away from ABC with no escape | ||
| // input coordinate at D should get snapped to the ABC way | ||
| // Should give the same result as A->1->C | ||
| auto result = gurka::do_action(valhalla::Options::route, map, {"A", "D", "C"}, "auto", {}, {}, | ||
| nullptr, "break_through"); | ||
| gurka::assert::raw::expect_path(result, {"AB", "AB", "AB", "BC"}); | ||
|
There was a problem hiding this comment. why are there three AB edges? im sure there is some detail i just cant remember at the moment... i get why there is one from A to the snap point at or near 1 and that then there is another for the next leg from that point to B but i cant figure out where the 3rd one is coming from at the moment. can you jog my memory? There was a problem hiding this comment. ha, great question!) actually, the first
There was a problem hiding this comment. I think, this should be fixed in another PR. There was a problem hiding this comment. interesting, we have a bit of code that is supposed to do this if i can remember where it is. it should say somethign like if its node snapped and its an origin no point in using the edge that is snapped to its end node... There was a problem hiding this comment. There was a problem hiding this comment. the purpose is to ignore end node snaps for origins of the route unless that is all we have There was a problem hiding this comment. https://github.com/valhalla/valhalla/blob/master/src/thor/timedep_forward.cc#L432 - we also use this condition that just checks that origin and destination on the same edge. so , probably it's needless |
||
| } | ||
| { | ||
| // BE is a oneway leading towards ABC with no way in | ||
| // input coordinate at E should get snapped to the ABC way | ||
| // Should give the same result as A->2->C | ||
| auto result = gurka::do_action(valhalla::Options::route, map, {"A", "E", "C"}, "auto", {}, {}, | ||
| nullptr, "break_through"); | ||
| gurka::assert::raw::expect_path(result, {"AB", "BC", "BC"}); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: should be
is_highly_reachableorhas_high_reach