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

Add living_street=yes as an alias for highway=living_street

Browse source 
See #174.
This commit is contained in:
Phyks (Lucas Verney) 2019-08-02 23:20:43 +02:00
parent 5c9b7fa7bf
commit 3ff7949c28
14 changed files with 98 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
misc/profiles2/car-eco-suspect_scan.brf
View file

@ -32,6 +32,8 @@ assign initialcost switch route=ferry 20000 0
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess
switch motorcar=
switch motor_vehicle=
@ -44,7 +46,7 @@ assign caraccess
switch highway=tertiary|tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch highway=residential|living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
access=yes|permissive|designated|destination
@ -104,7 +106,7 @@ assign maxspeed_implicit =
switch highway=unclassified 50
switch route=ferry 10
switch highway=bridleway 10
switch highway=residential|living_street 30
switch isresidentialorliving 30
switch highway=service 30
switch highway=track|road|path switch tracktype=grade1 30 5
0
@ -148,7 +150,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2
@ -165,7 +167,7 @@ assign costfactor = if equal maxspeed 0
assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then implicitoneway else oneway=yes|true|1
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 false
@ -176,7 +178,7 @@ assign classifiermask add isbadoneway
add multiply isroundabout 4
add multiply islinktype 8
add multiply isgoodforcars 16
multiply highway=residential|living_street 32
multiply isresidentialorliving 32
---context:node # following code refers to node tags

12
misc/profiles2/car-eco.brf
View file

@ -36,6 +36,8 @@ assign classifier_ferry = 2
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess
switch motorcar=
switch motor_vehicle=
@ -48,7 +50,7 @@ assign caraccess
switch highway=tertiary|tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch highway=residential|living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
access=yes|permissive|designated|destination
@ -111,7 +113,7 @@ assign maxspeed_implicit =
switch highway=unclassified 50
switch route=ferry 10
switch highway=bridleway 10
switch highway=residential|living_street 30
switch isresidentialorliving 30
switch highway=service 30
switch highway=track|road|path switch tracktype=grade1 30 5
0
@ -197,7 +199,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2
@ -209,7 +211,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then junction=roundabout else oneway=yes|true|1
assign isroundabout = junction=roundabout
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 false
@ -220,7 +222,7 @@ assign classifiermask add isbadoneway
add multiply isroundabout 4
add multiply islinktype 8
add multiply isgoodforcars 16
add multiply highway=residential|living_street 32
add multiply isresidentialorliving 32
multiply caraccess_destination 64
---context:node # following code refers to node tags

12
misc/profiles2/car-fast.brf
View file

@ -36,6 +36,8 @@ assign classifier_ferry = 2
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess
switch motorcar=
switch motor_vehicle=
@ -48,7 +50,7 @@ assign caraccess
switch highway=tertiary|tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch highway=residential|living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
access=yes|permissive|designated|destination
@ -111,7 +113,7 @@ assign maxspeed_implicit =
switch highway=unclassified 50
switch route=ferry 10
switch highway=bridleway 10
switch highway=residential|living_street 30
switch isresidentialorliving 30
switch highway=service 30
switch highway=track|road|path switch tracktype=grade1 30 5
0
@ -197,7 +199,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2
@ -209,7 +211,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then junction=roundabout else oneway=yes|true|1
assign isroundabout = junction=roundabout
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 false
@ -220,7 +222,7 @@ assign classifiermask add isbadoneway
add multiply isroundabout 4
add multiply islinktype 8
add multiply isgoodforcars 16
add multiply highway=residential|living_street 32
add multiply isresidentialorliving 32
multiply caraccess_destination 64
---context:node # following code refers to node tags

8
misc/profiles2/car-traffic_analysis.brf
View file

@ -30,6 +30,8 @@ assign initialcost switch route=ferry 20000 0
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess
switch motorcar=
switch motor_vehicle=
@ -42,7 +44,7 @@ assign caraccess
switch or highway=tertiary highway=tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch or highway=residential highway=living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
or access=yes or access=permissive or access=designated access=destination
@ -82,7 +84,7 @@ assign costfactor
switch highway=unclassified 2.5
switch route=ferry 5.67
switch highway=bridleway 5
switch or highway=residential highway=living_street 3.5
switch isresidentialorliving 3.5
switch highway=service 3.5
switch or highway=track or highway=road highway=path
switch tracktype=grade1 5
@ -91,7 +93,7 @@ assign costfactor
10000
assign trafficsourcedensity =
if highway=residential|living_street then 1
if isresidentialorliving then 1
else if and maxspeed=30|50 highway=tertiary|secondary|primary then 1
else 0

12
misc/profiles2/car-vario.brf
View file

@ -36,6 +36,8 @@ assign classifier_ferry = 2
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign caraccess
switch motorcar=
switch motor_vehicle=
@ -48,7 +50,7 @@ assign caraccess
switch highway=tertiary|tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch highway=residential|living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
access=yes|permissive|designated|destination
@ -111,7 +113,7 @@ assign maxspeed_implicit =
switch highway=unclassified 50
switch route=ferry 10
switch highway=bridleway 10
switch highway=residential|living_street 30
switch isresidentialorliving 30
switch highway=service 30
switch highway=track|road|path switch tracktype=grade1 30 5
0
@ -197,7 +199,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2
@ -209,7 +211,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then junction=roundabout else oneway=yes|true|1
assign isroundabout = junction=roundabout
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 false
@ -220,7 +222,7 @@ assign classifiermask add isbadoneway
add multiply isroundabout 4
add multiply islinktype 8
add multiply isgoodforcars 16
add multiply highway=residential|living_street 32
add multiply isresidentialorliving 32
multiply caraccess_destination 64
---context:node # following code refers to node tags

8
misc/profiles2/fastbike-asia-pacific.brf
View file

@ -116,6 +116,8 @@ assign onewaypenalty =
)
else 0.0
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign costfactor
switch and highway= not route=ferry 10000
@ -135,7 +137,7 @@ assign costfactor
switch route=ferry 5.67
switch highway=bridleway 5
switch highway=cycleway 1.3
switch or highway=residential highway=living_street switch isunpaved 10 1.2
switch isresidentialorliving switch isunpaved 10 1.2
switch highway=service switch isunpaved 10 1.2
switch or highway=track or highway=road or highway=path highway=footway
switch tracktype=grade1 switch isunpaved 3 1.2
@ -162,7 +164,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -181,7 +183,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
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 false

8
misc/profiles2/fastbike-lowtraffic.brf
View file

@ -139,6 +139,8 @@ assign trafficpenalty =
if hascycleway then min 0.3 trafficpenalty0
else trafficpenalty0
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign costfactor
switch and highway= not route=ferry 10000
@ -159,7 +161,7 @@ assign costfactor
switch route=ferry 5.67
switch highway=bridleway 5
switch highway=cycleway|footway 1.3
switch or highway=residential highway=living_street switch isunpaved 10 1.2
switch isresidentialorliving switch isunpaved 10 1.2
switch highway=service switch isunpaved 10 1.2
switch or highway=track or highway=road or highway=path highway=footway
switch tracktype=grade1 switch isunpaved 3 1.2
@ -186,7 +188,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -205,7 +207,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
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 false

8
misc/profiles2/fastbike.brf
View file

@ -111,6 +111,8 @@ assign onewaypenalty =
)
else 0.0
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign costfactor
switch and highway= not route=ferry 10000
@ -130,7 +132,7 @@ assign costfactor
switch route=ferry 5.67
switch highway=bridleway 5
switch highway=cycleway 1.3
switch or highway=residential highway=living_street switch isunpaved 10 1.2
switch isresidentialorliving switch isunpaved 10 1.2
switch highway=service switch isunpaved 10 1.2
switch or highway=track or highway=road or highway=path highway=footway
switch tracktype=grade1 switch isunpaved 3 1.2
@ -157,7 +159,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -176,7 +178,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
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 false

2
misc/profiles2/lookups.dat
View file

@ -634,6 +634,8 @@ embedded_rails;0000000928 tram
embedded_rails;0000000007 yes
embedded_rails;0000000003 rail
living_street;0000000404 yes
---context:node
highway;0001314954 bus_stop

10
misc/profiles2/moped.brf
View file

@ -29,6 +29,8 @@ assign initialcost switch route=ferry 20000 0
#
# calculate logical car access
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign motorverhicleaccess
switch motor_vehicle=
switch vehicle=
@ -39,7 +41,7 @@ assign motorverhicleaccess
switch or highway=tertiary highway=tertiary_link 1
switch highway=unclassified 1
switch route=ferry 1
switch or highway=residential highway=living_street 1
switch isresidentialorliving 1
switch highway=service 1
0
or access=yes or access=designated access=destination
@ -90,7 +92,7 @@ assign costfactor
switch highway=unclassified 1.2
switch route=ferry 5.67
switch highway=bridleway 5
switch or highway=residential highway=living_street 2
switch isresidentialorliving 2
switch highway=service 2
switch or highway=track or highway=road highway=path
switch tracktype=grade1 5
@ -113,7 +115,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=track ) then if tracktype=grade1 then 4 else 2
else if ( highway=bridleway|road ) then 2
@ -126,7 +128,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
else if oneway= then junction=roundabout else oneway=yes|true|1
assign isroundabout = junction=roundabout
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 false

6
misc/profiles2/shortest.brf
View file

@ -67,6 +67,8 @@ assign costfactor
# way priorities used for voice hint generation
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign priorityclassifier =
if ( highway=motorway ) then 30
@ -80,7 +82,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -95,7 +97,7 @@ assign priorityclassifier =
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
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 false

7
misc/profiles2/trekking.brf
View file

@ -157,6 +157,7 @@ assign onewaypenalty =
# must be >=1 and it's supposed to be close to 1 for
# the type of way the routing profile is searching for
#
assign isresidentialorliving = or highway=residential|living_street living_street=yes
assign costfactor
#
@ -203,7 +204,7 @@ assign costfactor
if ( highway=pedestrian ) then 3
else if ( highway=bridleway ) then 5
else if ( highway=cycleway ) then 1
else if ( highway=residential|living_street ) then ( if isunpaved then 1.5 else 1.1 )
else if ( isresidentialorliving ) then ( if isunpaved then 1.5 else 1.1 )
else if ( highway=service ) then ( if isunpaved then 1.6 else 1.3 )
#
@ -256,7 +257,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
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=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -274,7 +275,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
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 false

10
misc/profiles2/vm-forum-liegerad-schnell.brf
View file

@ -253,7 +253,7 @@ assign costfactor
switch tracktype=grade5 add lmc 50 # Kosten für kaum erkennbare Feldwege
add lmc 20 # Kosten für Feldwege ohne Oberflächenangabe
switch cycleway 1.3 # Kosten für Fahrradwege
switch highway=living_street 4 # Kosten für Spielstraßen
switch ( or highway=living_street living_street=yes ) 4 # Kosten für Spielstraßen
switch highway=road 7 # Kosten für noch nicht genauer beschriebene Straße
switch footway 15 # Kosten für Fußwege
switch highway=pedestrian 20 # Kosten für Gehwege
@ -296,7 +296,7 @@ assign uphillcostfactor
switch tracktype=grade5 add lmc 50
add lmc 20
switch cycleway 1
switch highway=living_street 2.5
switch ( or highway=living_street living_street=yes ) 2.5
switch highway=road 5
switch footway 15
switch highway=pedestrian 20
@ -339,7 +339,7 @@ assign downhillcostfactor
switch tracktype=grade5 add lmc 50
add lmc 20
switch cycleway 2
switch highway=living_street 8
switch ( or highway=living_street living_street=yes ) 8
switch highway=road 10
switch footway 20
switch highway=pedestrian 30
@ -366,7 +366,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
else if ( highway=unclassified ) then 20
else if ( highway=residential|living_street ) then 6
else if ( or highway=residential|living_street living_street=yes ) then 6
else if ( highway=service ) then 6
else if ( highway=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -384,7 +384,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
assign isgoodforcars = if greater priorityclassifier 6 then true
else if highway=residential|living_street|service then true
else if ( or highway=residential|living_street|service living_street=yes ) then true
else if ( and highway=track tracktype=grade1 ) then true
else false

10
misc/profiles2/vm-forum-velomobil-schnell.brf
View file

@ -253,7 +253,7 @@ assign costfactor
switch tracktype=grade5 add lmc 50 # Kosten für kaum erkennbare Feldwege
add lmc 20 # Kosten für Feldwege ohne Oberflächenangabe
switch cycleway 2.5 # Kosten für Fahrradwege
switch highway=living_street 5 # Kosten für Spielstraßen
switch ( or highway=living_street living_street=yes ) 5 # Kosten für Spielstraßen
switch highway=road 10 # Kosten für noch nicht genauer beschriebene Straße
switch footway 30 # Kosten für Fußwege
switch highway=pedestrian 30 # Kosten für Gehwege
@ -296,7 +296,7 @@ assign uphillcostfactor
switch tracktype=grade5 add lmc 50
add lmc 20
switch cycleway 2
switch highway=living_street 5
switch ( or highway=living_street living_street=yes ) 5
switch highway=road 10
switch footway 30
switch highway=pedestrian 30
@ -339,7 +339,7 @@ assign downhillcostfactor
switch tracktype=grade5 add lmc 50
add lmc 20
switch cycleway 5
switch highway=living_street 8
switch ( or highway=living_street living_street=yes ) 8
switch highway=road 10
switch footway 30
switch highway=pedestrian 30
@ -366,7 +366,7 @@ assign priorityclassifier =
else if ( highway=tertiary ) then 22
else if ( highway=tertiary_link ) then 21
else if ( highway=unclassified ) then 20
else if ( highway=residential|living_street ) then 6
else if ( or highway=residential|living_street living_street=yes ) then 6
else if ( highway=service ) then 6
else if ( highway=cycleway ) then 6
else if ( bicycle=designated ) then 6
@ -384,7 +384,7 @@ assign isgoodoneway = if reversedirection=yes then oneway=-1
assign isroundabout = junction=roundabout
assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link
assign isgoodforcars = if greater priorityclassifier 6 then true
else if highway=residential|living_street|service then true
else if ( or highway=residential|living_street|service living_street=yes ) then true
else if ( and highway=track tracktype=grade1 ) then true
else false