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

Fix bug in bearing filter related to reverse edges. Fix tests to catch it. Still one outstanding test failure that looks like a problem in the viaroute results.

Browse Source
This commit is contained in:
Daniel Patterson
2015-11-18 10:57:20 -05:00
parent 8b11cdbf61
commit d7989f19cf
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data_structures/static_rtree.hpp
+8 -4
View File
@@ -790,8 +790,10 @@ class StaticRTree
? (forward_edge_bearing - 180)
: (forward_edge_bearing + 180);
const bool forward_bearing_valid = IsBearingWithinBounds(forward_edge_bearing, filter_bearing, filter_bearing_range);
const bool backward_bearing_valid = IsBearingWithinBounds(backward_edge_bearing, filter_bearing, filter_bearing_range);
const bool forward_bearing_valid = IsBearingWithinBounds(forward_edge_bearing, filter_bearing, filter_bearing_range)
&& current_segment.forward_edge_based_node_id != SPECIAL_NODEID;
const bool backward_bearing_valid = IsBearingWithinBounds(backward_edge_bearing, filter_bearing, filter_bearing_range)
&& current_segment.reverse_edge_based_node_id != SPECIAL_NODEID;
if (!forward_bearing_valid && !backward_bearing_valid)
{
@@ -961,8 +963,10 @@ class StaticRTree
? (forward_edge_bearing - 180)
: (forward_edge_bearing + 180);
const bool forward_bearing_valid = IsBearingWithinBounds(forward_edge_bearing, filter_bearing, filter_bearing_range);
const bool backward_bearing_valid = IsBearingWithinBounds(backward_edge_bearing, filter_bearing, filter_bearing_range);
const bool forward_bearing_valid = IsBearingWithinBounds(forward_edge_bearing, filter_bearing, filter_bearing_range)
&& current_segment.forward_edge_based_node_id != SPECIAL_NODEID;
const bool backward_bearing_valid = IsBearingWithinBounds(backward_edge_bearing, filter_bearing, filter_bearing_range)
&& current_segment.reverse_edge_based_node_id != SPECIAL_NODEID;
if (!forward_bearing_valid && !backward_bearing_valid)
{