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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data_structures/static_rtree.hpp
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)
{

30
features/testbot/bearing_param.feature
View File

@ -54,17 +54,17 @@ Feature: Bearing parameter
| da | yes |
When I route I should get
| from | to | param:b | route | bearing |
| 0 | b | 10&b=10 | | |
| 0 | b | 90&b=90 | ab | 90 |
| 0 | b | 170&b=170 | | |
| 0 | b | 190&b=190 | | |
| 0 | 1 | 90&b=270 | ab,bc,cd | 90,0,270 |
| 1 | d | 10&b=10 | | |
| 1 | d | 90&b=90 | | |
| 1 | 0 | 190&b=190 | | |
| 1 | d | 270&b=270 | cd | 270 |
| 1 | d | 350&b=350 | | |
| from | to | param:b | route | bearing |
| 0 | b | 10&b=10 | bc | 0 |
| 0 | b | 90&b=90 | ab | 90 |
| 0 | b | 170&b=170 | da | 180 |
| 0 | b | 189&b=189 | da | 180 |
| 0 | 1 | 90&b=270 | ab,bc,cd | 90,0,270 |
| 1 | d | 10&b=10 | bc | 0 |
| 1 | d | 90&b=90 | ab,bc,cd,da | 90,0,270,180 |
| 1 | 0 | 189&b=189 | da | 180 |
| 1 | d | 270&b=270 | cd | 270 |
| 1 | d | 349&b=349 | | |
Scenario: Testbot - Initial bearing in all direction
Given the node map
@ -97,11 +97,11 @@ Feature: Bearing parameter
When I route I should get
| from | to | param:b | route | bearing |
| i | q | 0&b=90 | ia,ab,bc,cd,de,ef,fg,gh,ha | 0,90,180,180,270,270,0,0,90 |
| 0 | q | 0&b=90 | ia,ab,bc,cd,de,ef,fg,gh,ha | 0,90,180,180,270,270,0,0,90 |
| 0 | a | 45&b=90 | jb,bc,cd,de,ef,fg,gh,ha | 45,180,180,270,270,0,0,90 |
| j | q | 90&b=90 | kc,cd,de,ef,fg,gh,ha | 90,180,270,270,0,0,90 |
| k | a | 135&b=90 | ld,de,ef,fg,gh,ha | 135,270,270,0,0,90 |
| 0 | q | 90&b=90 | kc,cd,de,ef,fg,gh,ha | 90,180,270,270,0,0,90 |
| 0 | a | 135&b=90 | ld,de,ef,fg,gh,ha | 135,270,270,0,0,90 |
| 0 | a | 180&b=90 | me,ef,fg,gh,ha | 180,270,0,0,90 |
| m | a | 225&b=90 | nf,fg,gh,ha | 225,0,0,90 |
| 0 | a | 225&b=90 | nf,fg,gh,ha | 225,0,0,90 |
| 0 | a | 270&b=90 | og,gh,ha | 270,0,90 |
| 0 | a | 315&b=90 | ph,ha | 315,90 |