backported recent abrench/master/.../car-fast.brf updates

This commit is contained in:
poutnikl 2019-09-09 17:56:03 +02:00
parent 973dbae703
commit e3dd21499f

View file

@ -49,6 +49,8 @@ assign is_avoided_motorway and avoid_motorways highway=motorway
# #
# calculate logical car access # calculate logical car access
# #
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess assign caraccess
switch motorcar= switch motorcar=
switch motor_vehicle= switch motor_vehicle=
@ -61,7 +63,7 @@ assign caraccess
switch highway=tertiary|tertiary_link 1 switch highway=tertiary|tertiary_link 1
switch highway=unclassified 1 switch highway=unclassified 1
switch route=ferry 1 switch route=ferry 1
switch highway=residential|living_street 1 switch isresidentialorliving 1
switch highway=service 1 switch highway=service 1
0 0
access=yes|permissive|designated|destination access=yes|permissive|designated|destination
@ -124,7 +126,7 @@ assign maxspeed_implicit =
switch highway=unclassified 50 switch highway=unclassified 50
switch route=ferry 10 switch route=ferry 10
switch highway=bridleway 10 switch highway=bridleway 10
switch highway=residential|living_street 30 switch isresidentialorliving 30
switch highway=service 30 switch highway=service 30
switch highway=track|road|path switch tracktype=grade1 30 5 switch highway=track|road|path switch tracktype=grade1 30 5
0 0
@ -214,7 +216,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22 else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21 else if ( highway=tertiary_link ) then 21
else if ( highway=unclassified ) then 20 else if ( highway=unclassified ) then 20
else if ( highway=residential|living_street ) then 6 else if ( isresidentialorliving ) then 6
else if ( highway=service ) then 6 else if ( highway=service ) then 6
else if ( highway=track ) then if tracktype=grade1 then 4 else 2 else if ( highway=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2 else if ( highway=bridleway|road ) then 2
@ -226,7 +228,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then junction=roundabout else oneway=yes|true|1 else if oneway= then junction=roundabout else oneway=yes|true|1
assign isroundabout = junction=roundabout assign isroundabout = junction=roundabout
assign isgoodforcars = if greater priorityclassifier 6 then true assign isgoodforcars = if greater priorityclassifier 6 then true
else if highway=residential|living_street|service then true else if or isresidentialorliving highway=service then true
else if ( and highway=track tracktype=grade1 ) then true else if ( and highway=track tracktype=grade1 ) then true
else false else false
@ -237,7 +239,7 @@ assign classifiermask add isbadoneway
add multiply isroundabout 4 add multiply isroundabout 4
add multiply islinktype 8 add multiply islinktype 8
add multiply isgoodforcars 16 add multiply isgoodforcars 16
add multiply highway=residential|living_street 32 add multiply isresidentialorliving 32
multiply caraccess_destination 64 multiply caraccess_destination 64
---context:node # following code refers to node tags ---context:node # following code refers to node tags