diff --git a/misc/profiles2/Car-FastEco-private.brf b/misc/profiles2/Car-FastEco-private.brf index 86a6abc..e556b28 100644 --- a/misc/profiles2/Car-FastEco-private.brf +++ b/misc/profiles2/Car-FastEco-private.brf @@ -215,7 +215,7 @@ assign caraccess switch or highway=residential highway=living_street 1 switch highway=service 1 0 - or access=yes or access=permissive or access=designated access=destination + or access=yes or access=permissive or access=designated or access=destination access=private or vehicle=yes or vehicle=designated vehicle=destination or motor_vehicle=yes or motor_vehicle=permissive or motor_vehicle=designated motor_vehicle=destination or motorcar=yes or motorcar=permissive or motorcar=designated motorcar=destination diff --git a/misc/profiles2/Hiking-Alpine-SAC6-private.brf b/misc/profiles2/Hiking-Alpine-SAC6-private.brf index aa8737e..d5f7491 100644 --- a/misc/profiles2/Hiking-Alpine-SAC6-private.brf +++ b/misc/profiles2/Hiking-Alpine-SAC6-private.brf @@ -139,23 +139,23 @@ assign initialcost switch or shortest_way is_ldhr 0 initialcost_value -assign defaultaccess switch access= not motorroad=yes switch or access=private access=no 0 1 +assign defaultaccess switch access= not motorroad=yes switch access=no 0 1 assign bikeaccess or any_cycleroute switch bicycle= switch vehicle= defaultaccess - switch or vehicle=private vehicle=no + switch vehicle=no 0 1 - not or bicycle=private or bicycle=no bicycle=dismount + not or bicycle=no bicycle=dismount assign footaccess or any_hiking_route or issidewalk or and bikeaccess not foot=no or bicycle=dismount - switch foot= defaultaccess not foot=private|no + switch foot= defaultaccess not foot=no assign accesspenalty switch footaccess 0 switch bikeaccess 4 100000 @@ -383,7 +383,7 @@ assign classifiermask add isbadoneway assign defaultaccess switch access= 1 # add default barrier restrictions here! - switch or access=private access=no + switch access=no 0 1 @@ -392,10 +392,10 @@ assign bikeaccess switch bicycle= switch vehicle= defaultaccess - switch or vehicle=private vehicle=no + switch vehicle=no 0 1 - switch or bicycle=private or bicycle=no bicycle=dismount + switch or bicycle=no bicycle=dismount 0 1 @@ -403,7 +403,7 @@ assign footaccess or bicycle=dismount switch foot= defaultaccess - switch or foot=private foot=no + switch foot=no 0 1 diff --git a/misc/profiles2/MTB-private.brf b/misc/profiles2/MTB-private.brf index d532a9c..86264f4 100644 --- a/misc/profiles2/MTB-private.brf +++ b/misc/profiles2/MTB-private.brf @@ -207,20 +207,20 @@ else 30 assign defaultaccess = if access= then not motorroad=yes - else if access=private|no then false + else if access=no then false else true assign bikeaccess = if nodeaccessgranted then true else if hascycleway then true - else if bicycle= then ( if vehicle= then defaultaccess else not vehicle=private|no ) - else not bicycle=private|no|dismount + else if bicycle= then ( if vehicle= then defaultaccess else not vehicle=no ) + else not bicycle=no|dismount assign footaccess = if bikeaccess then true else if bicycle=dismount then true else if foot= then defaultaccess - else not foot=private|no + else not foot=no assign accesspenalty = if bikeaccess then 0 @@ -532,7 +532,7 @@ assign initial_cost_node 0 # 0 as default assign defaultaccess = if ( access= ) then if allow_default_barrier_restriction then not barrier=gate # add default barrier restrictions here! - modified v2.5.15, conditioned in 2.6 else true - else if ( access=private|no ) then false + else if ( access=no ) then false else true assign bikeaccess = @@ -540,14 +540,14 @@ assign bikeaccess = else if bicycle= then ( if vehicle= then defaultaccess - else not vehicle=private|no + else not vehicle=no ) - else not bicycle=private|no|dismount + else not bicycle=no|dismount assign footaccess = if bicycle=dismount then true else if foot= then defaultaccess - else not foot=private|no + else not foot=no assign initialcost = diff --git a/misc/profiles2/Trekking-dry-private.brf b/misc/profiles2/Trekking-dry-private.brf index 79a05da..300e437 100644 --- a/misc/profiles2/Trekking-dry-private.brf +++ b/misc/profiles2/Trekking-dry-private.brf @@ -207,20 +207,20 @@ else 30 assign defaultaccess = if access= then not motorroad=yes - else if access=private|no then false + else if access=no then false else true assign bikeaccess = if nodeaccessgranted then true else if hascycleway then true - else if bicycle= then ( if vehicle= then defaultaccess else not vehicle=private|no ) - else not bicycle=private|no|dismount + else if bicycle= then ( if vehicle= then defaultaccess else not vehicle=no ) + else not bicycle=no|dismount assign footaccess = if bikeaccess then true else if bicycle=dismount then true else if foot= then defaultaccess - else not foot=private|no + else not foot=no assign accesspenalty = if bikeaccess then 0 @@ -532,7 +532,7 @@ assign initial_cost_node 0 # 0 as default assign defaultaccess = if ( access= ) then if allow_default_barrier_restriction then not barrier=gate # add default barrier restrictions here! - modified v2.5.15, conditioned in 2.6 else true - else if ( access=private|no ) then false + else if ( access=no ) then false else true assign bikeaccess = @@ -540,14 +540,14 @@ assign bikeaccess = else if bicycle= then ( if vehicle= then defaultaccess - else not vehicle=private|no + else not vehicle=no ) - else not bicycle=private|no|dismount + else not bicycle=no|dismount assign footaccess = if bicycle=dismount then true else if foot= then defaultaccess - else not foot=private|no + else not foot=no assign initialcost = diff --git a/misc/profiles2/fastbike-private.brf b/misc/profiles2/fastbike-private.brf index 1c48994..3abcb86 100644 --- a/misc/profiles2/fastbike-private.brf +++ b/misc/profiles2/fastbike-private.brf @@ -85,7 +85,7 @@ assign defaultaccess else if highway=motorway|motorway_link then false else true ) - switch or access=private access=no + switch access=no false true @@ -98,8 +98,8 @@ assign bikeaccess = true switch vehicle= ( if highway=footway then false else defaultaccess ) - not vehicle=private|no - not or bicycle=private or bicycle=no bicycle=dismount + not vehicle=no + not or bicycle=no bicycle=dismount # # calculate logical foot access @@ -109,7 +109,7 @@ assign footaccess = or bicycle=dismount switch foot= defaultaccess - not or foot=private foot=no + not foot=no # # if not bike-, but foot-acess, just a moderate penalty, @@ -327,7 +327,7 @@ assign dummyUsage = smoothness= assign defaultaccess switch access= 1 # add default barrier restrictions here! - switch or access=private access=no + switch access=no 0 1 @@ -336,10 +336,10 @@ assign bikeaccess switch bicycle= switch vehicle= defaultaccess - switch or vehicle=private vehicle=no + switch vehicle=no 0 1 - switch or bicycle=private or bicycle=no bicycle=dismount + switch or bicycle=no bicycle=dismount 0 1 @@ -347,7 +347,7 @@ assign footaccess or bicycle=dismount switch foot= defaultaccess - switch or foot=private foot=no + switch foot=no 0 1