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

changed route-preselection

Browse source
This commit is contained in:
Arndt 2014-05-11 17:20:06 +02:00
parent 1b8c3ccea8
commit d89790cfd3
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
brouter-map-creator/src/main/java/btools/mapcreator/WayCutter.java
View file

@ -98,14 +98,16 @@ public class WayCutter extends MapCreatorBase
// propagate the cycleway-bit // propagate the cycleway-bit
if ( cyclewayset.contains( data.wid ) ) if ( cyclewayset.contains( data.wid ) )
{ {
boolean ok = true;
// check access and log a warning for conflicts // check access and log a warning for conflicts
expctxCheck.evaluate( data.description, null );
boolean ok = expctxCheck.getCostfactor() < 10000.;
expctxReport.evaluate( data.description, null ); expctxReport.evaluate( data.description, null );
boolean warn = expctxReport.getCostfactor() >= 10000.; boolean warn = expctxReport.getCostfactor() >= 10000.;
if ( warn ) if ( warn )
{ {
System.out.println( "** relation access conflict for wid = " + data.wid + " tags:" + expctxReport.getKeyValueDescription( data.description ) + " (ok=" + ok + ")" ); expctxCheck.evaluate( data.description, null );
ok = expctxCheck.getCostfactor() < 10000.;
System.out.println( "** relation access conflict for wid = " + data.wid + " tags:" + expctxReport.getKeyValueDescription( data.description ) + " (ok=" + ok + ")" );
} }
if ( ok ) if ( ok )

3
brouter-map-creator/src/test/resources/softaccess.brf
View file

@ -11,11 +11,12 @@ assign costfactor
# #
# exclude motorways, proposed roads and motorroads # exclude motorways, proposed roads and motorroads
# #
switch bicycle=yes 1
switch or highway=motorway highway=motorway_link 100000 switch or highway=motorway highway=motorway_link 100000
switch highway=proposed 100000 switch highway=proposed 100000
switch motorroad=yes 100000 switch motorroad=yes 100000
1.0 1
---context:node # following code refers to node tags ---context:node # following code refers to node tags

3
misc/scripts/mapcreation/softaccess.brf
View file

@ -11,11 +11,12 @@ assign costfactor
# #
# exclude motorways, proposed roads and motorroads # exclude motorways, proposed roads and motorroads
# #
switch bicycle=yes 1
switch or highway=motorway highway=motorway_link 100000 switch or highway=motorway highway=motorway_link 100000
switch highway=proposed 100000 switch highway=proposed 100000
switch motorroad=yes 100000 switch motorroad=yes 100000
1.0 1
---context:node # following code refers to node tags ---context:node # following code refers to node tags