From 0b1fef2778db03304ced093fef8c94476b62c679 Mon Sep 17 00:00:00 2001 From: "Phyks (Lucas Verney)" Date: Thu, 3 Oct 2019 18:03:51 +0200 Subject: [PATCH] Generate fastbike-lowtraffic as a variant of fastbike with configuration options --- misc/profiles2/fastbike-lowtraffic.brf | 249 -------------------- misc/profiles2/fastbike.brf | 50 +++- misc/profiles2/generate_profile_variants.sh | 1 + 3 files changed, 45 insertions(+), 255 deletions(-) delete mode 100644 misc/profiles2/fastbike-lowtraffic.brf diff --git a/misc/profiles2/fastbike-lowtraffic.brf b/misc/profiles2/fastbike-lowtraffic.brf deleted file mode 100644 index 7e3b22e..0000000 --- a/misc/profiles2/fastbike-lowtraffic.brf +++ /dev/null @@ -1,249 +0,0 @@ -# -# A fastbike could be a racing bike or a speed pedelec. -# But also at night or in rainy whether you might want -# to fallback to this one. -# -# Structure is similar to trekking.brf, see this for documenation. -# - ----context:global # following code refers to global config - -# Use the following switches to change behaviour -# (1=yes, 0=no): - -assign consider_elevation 1 # set to 0 to ignore elevation in routing -assign allow_steps 1 # set to 0 to disallow steps -assign allow_ferries 1 # set to 0 to disallow ferries -assign ignore_cycleroutes 0 # set to 1 for better elevation results -assign stick_to_cycleroutes 0 # set to 1 to just follow cycleroutes -assign avoid_unsafe 0 # set to 1 to avoid standard highways -assign turnInstructionMode 1 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style, 4=comment-style, 5=gpsies-style - -assign validForBikes 1 - -# the elevation parameters - -assign downhillcost switch consider_elevation 60 0 -assign downhillcutoff 1.5 -assign uphillcost 0 -assign uphillcutoff 1.5 - ----context:way # following code refers to way-tags - -assign any_cycleroute or route_bicycle_icn=yes or route_bicycle_ncn=yes or route_bicycle_rcn=yes route_bicycle_lcn=yes -assign nodeaccessgranted or any_cycleroute lcn=yes - -assign ispaved or surface=paved or surface=asphalt or surface=concrete surface=paving_stones -assign isunpaved not or surface= or ispaved or surface=fine_gravel surface=cobblestone - -assign turncost = if junction=roundabout then 0 - else 90 - -assign initialcost switch route=ferry 10000 0 - -# -# calculate logical bike access -# -assign bikeaccess = - if any_cycleroute then true - else if bicycle= then - ( - if bicycle_road=yes then true - else if vehicle= then - ( - if access= then not or motorroad=yes highway=footway - else if access=private|no then false - else true - ) - else not vehicle=private|no - ) - else not bicycle=private|no|dismount - -# -# calculate logical foot access -# -assign footaccess = - if bikeaccess then true - else if bicycle=dismount then true - else if foot= then - ( - if access= then not motorroad=yes - else if access=private|no then false - else true - ) - else not foot=private|no - -# -# if not bike-, but foot-acess, just a moderate penalty, -# otherwise access is forbidden -# -assign accesspenalty = - if bikeaccess then 0 - else if footaccess then 6 - else 100000 - -# -# handle one-ways. On primary roads, wrong-oneways should -# be close to forbidden, while on other ways we just add -# 6 to the costfactor (making it at least 7 - you are allowed -# to push your bike) -# -assign badoneway = - if reversedirection=yes then - if oneway:bicycle=yes then true - else if oneway= then junction=roundabout - else oneway=yes|true|1 - else oneway=-1 - -assign onewaypenalty = - if ( badoneway ) then - ( - if ( cycleway=opposite|opposite_lane|opposite_track ) then 0 - else if ( oneway:bicycle=no ) then 0 - else if ( highway=primary|primary_link ) then 50 - else if ( highway=secondary|secondary_link ) then 30 - else if ( highway=tertiary|tertiary_link ) then 20 - else 6.0 - ) - else 0.0 - -assign hascycleway = not - and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no ) - -assign trafficpenalty0 = - if highway=primary|primary_link then - ( - if estimated_traffic_class=4 then 0.2 - else if estimated_traffic_class=5 then 0.4 - else if estimated_traffic_class=6|7 then 0.6 - else 0 - ) - else if highway=secondary|secondary_link then - ( - if estimated_traffic_class=3 then 0.2 - else if estimated_traffic_class=4 then 0.4 - else if estimated_traffic_class=5 then 0.6 - else if estimated_traffic_class=6|7 then 1 - else 0 - ) - else if highway=tertiary|tertiary_link then - ( - if estimated_traffic_class=2 then 0.1 - else if estimated_traffic_class=3 then 0.3 - else if estimated_traffic_class=4 then 0.5 - else if estimated_traffic_class=5|6|7 then 1 - else 0 - ) - else 0 - -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 - switch or highway=proposed highway=abandoned 10000 - - min 9999 - add max onewaypenalty accesspenalty - add trafficpenalty - - switch or highway=motorway highway=motorway_link 10000 - switch or highway=trunk highway=trunk_link 10 - switch or highway=primary highway=primary_link 1.2 - switch or highway=secondary highway=secondary_link 1.1 - switch or highway=tertiary highway=tertiary_link 1.0 - switch highway=unclassified 1.1 - switch highway=pedestrian 10 - switch highway=steps 1000 - switch route=ferry 5.67 - switch highway=bridleway 5 - switch highway=cycleway|footway 1.3 - 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 - switch tracktype=grade2 switch isunpaved 10 3 - switch tracktype=grade3 10.0 - switch tracktype=grade4 20.0 - switch tracktype=grade5 30.0 - switch or bicycle=designated bicycle_road=yes 1.3 - switch ispaved 2.0 100.0 - 10.0 - -# way priorities used for voice hint generation - -assign priorityclassifier = - - if ( highway=motorway ) then 30 - else if ( highway=motorway_link ) then 29 - else if ( highway=trunk ) then 28 - else if ( highway=trunk_link ) then 27 - else if ( highway=primary ) then 26 - else if ( highway=primary_link ) then 25 - else if ( highway=secondary ) then 24 - else if ( highway=secondary_link ) then 23 - else if ( highway=tertiary ) then 22 - else if ( highway=tertiary_link ) then 21 - else if ( highway=unclassified ) then 20 - else if ( isresidentialorliving ) then 6 - else if ( highway=service ) then 6 - else if ( highway=cycleway ) then 6 - else if ( or bicycle=designated bicycle_road=yes ) then 6 - else if ( highway=track ) then if tracktype=grade1 then 6 else 4 - else if ( highway=bridleway|road|path|footway ) then 4 - else if ( highway=steps ) then 2 - else if ( highway=pedestrian ) then 2 - else 0 - - -# some more classifying bits used for voice hint generation... - -assign isbadoneway = not equal onewaypenalty 0 -assign isgoodoneway = if reversedirection=yes then oneway=-1 - else if oneway= then junction=roundabout else oneway=yes|true|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 ( or isresidentialorliving highway=service ) then true - else if ( and highway=track tracktype=grade1 ) then true - else false - ----context:node # following code refers to node tags - -assign defaultaccess - switch access= - 1 # add default barrier restrictions here! - switch or access=private access=no - 0 - 1 - -assign bikeaccess - or nodeaccessgranted=yes - switch bicycle= - switch vehicle= - defaultaccess - switch or vehicle=private vehicle=no - 0 - 1 - switch or bicycle=private or bicycle=no bicycle=dismount - 0 - 1 - -assign footaccess - or bicycle=dismount - switch foot= - defaultaccess - switch or foot=private foot=no - 0 - 1 - -assign initialcost - switch bikeaccess - 0 - switch footaccess - 300 - 1000000 diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf index cecd359..ddf039d 100644 --- a/misc/profiles2/fastbike.brf +++ b/misc/profiles2/fastbike.brf @@ -19,6 +19,7 @@ # (1=yes, 0=no): assign consider_elevation = true # set to false to ignore elevation in routing +assign consider_traffic = false # set to true to avoid traffic assign allow_steps = true # set to false to disallow steps assign allow_ferries = true # set to false to disallow ferries assign ignore_cycleroutes = false # set to true for better elevation results @@ -67,22 +68,20 @@ assign defaultaccess # # calculate logical bike access # -assign bikeaccess +assign bikeaccess = or any_cycleroute switch bicycle= switch bicycle_road=yes - 1 + true switch vehicle= defaultaccess - switch or vehicle=private vehicle=no - 0 - 1 + not vehicle=private|no not or bicycle=private or bicycle=no bicycle=dismount # # calculate logical foot access # -assign footaccess +assign footaccess = or bikeaccess or bicycle=dismount switch foot= @@ -125,6 +124,44 @@ assign onewaypenalty = ) else 0.0 +# Eventually compute traffic penalty +assign hascycleway = not + and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no ) + +assign trafficpenalty0 = + if highway=primary|primary_link then + ( + if estimated_traffic_class=4 then 0.2 + else if estimated_traffic_class=5 then 0.4 + else if estimated_traffic_class=6|7 then 0.6 + else 0 + ) + else if highway=secondary|secondary_link then + ( + if estimated_traffic_class=3 then 0.2 + else if estimated_traffic_class=4 then 0.4 + else if estimated_traffic_class=5 then 0.6 + else if estimated_traffic_class=6|7 then 1 + else 0 + ) + else if highway=tertiary|tertiary_link then + ( + if estimated_traffic_class=2 then 0.1 + else if estimated_traffic_class=3 then 0.3 + else if estimated_traffic_class=4 then 0.5 + else if estimated_traffic_class=5|6|7 then 1 + else 0 + ) + else 0 + +assign trafficpenalty = + if consider_traffic then + ( + if hascycleway then min 0.3 trafficpenalty0 + else trafficpenalty0 + ) + else 0 + assign isresidentialorliving = or highway=residential|living_street living_street=yes assign costfactor @@ -134,6 +171,7 @@ assign costfactor min 9999 add max onewaypenalty accesspenalty + add trafficpenalty switch or highway=motorway highway=motorway_link switch allow_motorways 1.5 10000 switch or highway=trunk highway=trunk_link switch allow_motorways 1.5 10 diff --git a/misc/profiles2/generate_profile_variants.sh b/misc/profiles2/generate_profile_variants.sh index 91a7aa0..b502e4b 100755 --- a/misc/profiles2/generate_profile_variants.sh +++ b/misc/profiles2/generate_profile_variants.sh @@ -6,6 +6,7 @@ sed -e "s/^assign[[:space:]]\+vmax.*\(#.*\)/assign vmax = 90 \1/" car-vario.brf # Fastbike variants sed -e "s/^assign[[:space:]]\+allow_motorways.*\(#.*\)/assign allow_motorways = true \1/" fastbike.brf > fastbike-asia-pacific.brf +sed -e "s/^assign[[:space:]]\+consider_traffic.*\(#.*\)/assign consider_traffic = true \1/" fastbike.brf > fastbike-lowtraffic.brf # Trekking variants sed -e "s/^assign[[:space:]]\+ignore_cycleroutes.*\(#.*\)/assign ignore_cycleroutes = true \1/" trekking.brf > trekking-ignore-cr.brf