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

Fix excluding nodes for one to all query

Browse Source
This commit is contained in:
Patrick Niklaus 2018-05-08 15:05:34 +00:00 committed by Patrick Niklaus
parent c459530cb6
commit 3b4e2e83ef
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/testbot/distance_matrix.feature
View File

@ -21,7 +21,6 @@ Feature: Basic Distance Matrix
| a | 0 | 100+-1 | | a | 0 | 100+-1 |
| b | 100+-1 | 0 | | b | 100+-1 | 0 |
@ch
Scenario: Testbot - Travel distance matrix of minimal network with toll exclude Scenario: Testbot - Travel distance matrix of minimal network with toll exclude
Given the query options Given the query options
| exclude | toll | | exclude | toll |
@ -46,7 +45,6 @@ Feature: Basic Distance Matrix
| c | | | 0 | 100+-1 | | c | | | 0 | 100+-1 |
| d | | | 100+-1 | 0 | | d | | | 100+-1 | 0 |
@ch
Scenario: Testbot - Travel distance matrix of minimal network with motorway exclude Scenario: Testbot - Travel distance matrix of minimal network with motorway exclude
Given the query options Given the query options
| exclude | motorway | | exclude | motorway |
@ -68,7 +66,6 @@ Feature: Basic Distance Matrix
| | a | b | c | d | | | a | b | c | d |
| a | 0 | 300+-2 | 100+-2 | 200+-2 | | a | 0 | 300+-2 | 100+-2 | 200+-2 |
@ch
Scenario: Testbot - Travel distance matrix of minimal network disconnected motorway exclude Scenario: Testbot - Travel distance matrix of minimal network disconnected motorway exclude
Given the query options Given the query options
| exclude | motorway | | exclude | motorway |
@ -90,7 +87,6 @@ Feature: Basic Distance Matrix
| | a | b | e | | | a | b | e |
| a | 0 | 50+-1 | | | a | 0 | 50+-1 | |
@ch
Scenario: Testbot - Travel distance matrix of minimal network with motorway and toll excludes Scenario: Testbot - Travel distance matrix of minimal network with motorway and toll excludes
Given the query options Given the query options
| exclude | motorway,toll | | exclude | motorway,toll |

6
src/engine/routing_algorithms/many_to_many_mld.cpp
View File

@ -276,6 +276,12 @@ oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
{ {
const auto &data = facade.GetEdgeData(edge); const auto &data = facade.GetEdgeData(edge);
const auto to = facade.GetTarget(edge); const auto to = facade.GetTarget(edge);
if (facade.ExcludeNode(to))
{
continue;
}
if ((DIRECTION == FORWARD_DIRECTION ? facade.IsForwardEdge(edge) if ((DIRECTION == FORWARD_DIRECTION ? facade.IsForwardEdge(edge)
: facade.IsBackwardEdge(edge)) && : facade.IsBackwardEdge(edge)) &&
!query_heap.WasInserted(to)) !query_heap.WasInserted(to))