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

Merge branch 'master' of https://github.com/abrensch/brouter

Browse source
This commit is contained in:
Arndt 2014-12-12 21:39:27 +01:00
commit d1eee16a93
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brouter-core/src/main/java/btools/router/RoutingContext.java
View file

@ -45,6 +45,7 @@ public final class RoutingContext implements DistanceChecker
public int uphillcostdiv;
public int uphillcutoff;
public boolean carMode;
public boolean forceSecondaryData;
public double pass1coefficient;
public double pass2coefficient;
public int elevationpenaltybuffer;
@ -60,6 +61,7 @@ public final class RoutingContext implements DistanceChecker
if ( downhillcostdiv != 0 ) downhillcostdiv = 1000000/downhillcostdiv;
if ( uphillcostdiv != 0 ) uphillcostdiv = 1000000/uphillcostdiv;
carMode = 0.f != expctxGlobal.getVariableValue( "validForCars", 0.f );
forceSecondaryData = 0.f != expctxGlobal.getVariableValue( "forceSecondaryData", 0.f );
pass1coefficient = expctxGlobal.getVariableValue( "pass1coefficient", 1.5f );
pass2coefficient = expctxGlobal.getVariableValue( "pass2coefficient", 0.f );
elevationpenaltybuffer = (int)(expctxGlobal.getVariableValue( "elevationpenaltybuffer", 5.f )*1000000);

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

@ -470,7 +470,7 @@ public class RoutingEngine extends Thread
{
nodesMap = new OsmNodesMap();
BExpressionContext ctx = routingContext.expctxWay;
nodesCache = new NodesCache(segmentDir, nodesMap, ctx.meta.lookupVersion, ctx.meta.lookupMinorVersion, ctx.meta.readVarLength, routingContext.carMode, nodesCache );
nodesCache = new NodesCache(segmentDir, nodesMap, ctx.meta.lookupVersion, ctx.meta.lookupMinorVersion, ctx.meta.readVarLength, routingContext.carMode, routingContext.forceSecondaryData, nodesCache );
}
private OsmNode getStartNode( long startId )