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

Keep a cost of -1 for nogos which should never been entered to prevent them from being fed in the priority queue

Browse source
This commit is contained in:
Phyks (Lucas Verney) 2018-11-11 18:44:58 +01:00
parent 910d6a0870
commit 3479fd7323
5 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brouter-core/src/main/java/btools/router/OsmNodeNamed.java
View file

@ -17,7 +17,11 @@ public class OsmNodeNamed extends OsmNode
@Override
public String toString()
{
return ilon + "," + ilat + "," + name + "," + nogoWeight;
if ( Double.isNaN(nogoWeight ) ) {
return ilon + "," + ilat + "," + name;
} else {
return ilon + "," + ilat + "," + name + "," + nogoWeight;
}
}
public static OsmNodeNamed decodeNogo( String s )
@ -30,7 +34,7 @@ public class OsmNodeNamed extends OsmNode
int idx3 = s.indexOf( ',', idx2+1 );
if ( idx3 == -1) {
n.name = s.substring( idx2 + 1 );
n.nogoWeight = 100000;
n.nogoWeight = Double.NaN;
} else {
n.name = s.substring( idx2+1, idx3 );
n.nogoWeight = Double.parseDouble( s.substring( idx3 + 1 ) );

13
brouter-core/src/main/java/btools/router/OsmPath.java
View file

@ -427,7 +427,11 @@ abstract class OsmPath implements OsmLinkHolder
}
if ( rc.nogomatch != null )
{
cost += rc.nogomatch.nogoWeight;
if ( Double.isNaN(rc.nogomatch.nogoWeight) ) {
cost = -1;
} else {
cost += rc.nogomatch.nogoWeight;
}
}
return;
}
@ -462,7 +466,12 @@ abstract class OsmPath implements OsmLinkHolder
// check for nogo-matches (after the *actual* start of segment)
if ( rc.nogomatch != null )
{
cost += rc.nogomatch.nogoWeight;
if ( Double.isNaN(rc.nogomatch.nogoWeight) ) {
cost = -1;
return;
} else {
cost += rc.nogomatch.nogoWeight;
}
}
// add target-node costs

1
brouter-core/src/main/java/btools/router/StdPath.java
View file

@ -180,7 +180,6 @@ final class StdPath extends OsmPath
return 0.;
}
@Override
public int elevationCorrection( RoutingContext rc )
{

4
brouter-mem-router/src/main/java/btools/memrouter/ScheduledRouter.java
View file

@ -305,9 +305,9 @@ System.out.println( "*** finishedOffsets = " + finishedOffsets );
}
// calc distance and check nogos
rc.nogomatch = false;
rc.nogomatch = null;
int distance = rc.calcDistance( currentNode.ilon, currentNode.ilat, node.ilon, node.ilat );
if ( rc.nogomatch )
if ( rc.nogomatch != null )
{
return;
}

2
brouter-server/src/main/java/btools/server/request/ServerHandler.java
View file

@ -222,7 +222,7 @@ public class ServerHandler extends RequestHandler {
for (int i = 0; i < lonLatRadList.length; i++)
{
String[] lonLatRad = lonLatRadList[i].split(",");
String nogoWeight = "100000";
String nogoWeight = "NaN";
if (lonLatRad.length > 3) {
nogoWeight = lonLatRad[3];
}