Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fixed problem for same-segment searches with exact node matches

Browse source
This commit is contained in:
Arndt Brenschede 2020-06-27 12:37:15 +02:00
parent 8159eaf024
commit 7e4bcebd3c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -590,11 +590,18 @@ public class RoutingEngine extends Thread
OsmPath p = getStartPath( n1, n2, new OsmNodeNamed( mwp.waypoint ), endPos ); OsmPath p = getStartPath( n1, n2, new OsmNodeNamed( mwp.waypoint ), endPos );
// special case: start+end on same segment // special case: start+end on same segment
if ( sameSegmentSearch ) if ( p.cost >= 0 && sameSegmentSearch )
{ {
OsmPath path2end = getStartPath( n1, n2, endPos, endPos );
boolean isDirect = path2end.cost >= p.cost;
OsmPath pe = getEndPath( n1, p.getLink(), endPos ); OsmPath pe = getEndPath( n1, p.getLink(), endPos );
OsmPath pt = getEndPath( n1, p.getLink(), null ); OsmPath pt = getEndPath( n1, p.getLink(), null );
int costdelta = pt.cost - p.cost; int costdelta = pt.cost - p.cost;
if ( isDirect && pe.cost < costdelta )
{
costdelta = pe.cost;
}
if ( pe.cost >= costdelta ) if ( pe.cost >= costdelta )
{ {
pe.cost -= costdelta; pe.cost -= costdelta;