From 09bed6e5310268d6ec11ca4fe2d57c601c47cb23 Mon Sep 17 00:00:00 2001 From: Brenschede Date: Fri, 5 Oct 2018 19:45:16 +0200 Subject: [PATCH] oneway+psv details --- misc/profiles2/car-eco-suspect_scan.brf | 210 ++++++++++++++++++++++++ misc/profiles2/car-eco.brf | 7 +- misc/profiles2/lookups.dat | 21 ++- 3 files changed, 233 insertions(+), 5 deletions(-) create mode 100644 misc/profiles2/car-eco-suspect_scan.brf diff --git a/misc/profiles2/car-eco-suspect_scan.brf b/misc/profiles2/car-eco-suspect_scan.brf new file mode 100644 index 0000000..6f8c343 --- /dev/null +++ b/misc/profiles2/car-eco-suspect_scan.brf @@ -0,0 +1,210 @@ +# +# Car-Routing based on a kinematic model +# +# Depending on the vmax-parameter (target-speed) +# this can be anything from least-time routing to eco-routing +# +# +---model:btools.router.KinematicModel + +---context:global + +# kinematic parameters + +assign vmax = 90 # kmh +assign recup_efficiency = 0.7 # (ratio) +assign totalweight = 1640 # kg +assign f_roll = 232 # Newton +assign f_air = 0.4 # 0.5*cw*A*rho +assign f_recup = 400 # Newton +assign p_standby = 250 # Watt + +# technical parameters + +assign validForCars = true +assign pass1coefficient = 1.3 +assign turnInstructionMode = 1 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style + +---context:way # following code refers to way-tags + +assign initialcost switch route=ferry 20000 0 + +# +# calculate logical car access +# +assign caraccess + switch motorcar= + switch motor_vehicle= + switch vehicle= + switch access= + switch highway=motorway|motorway_link 1 + switch highway=trunk|trunk_link 1 + switch highway=primary|primary_link 1 + switch highway=secondary|secondary_link 1 + switch highway=tertiary|tertiary_link 1 + switch highway=unclassified 1 + switch route=ferry 1 + switch highway=residential|living_street 1 + switch highway=service 1 + 0 + access=yes|permissive|designated|destination + vehicle=yes|designated|destination + motor_vehicle=yes|permissive|designated|destination + motorcar=yes|permissive|designated|destination + +assign unknowncaraccess + switch motorcar= + switch motor_vehicle= + switch vehicle= + access=unknown + vehicle=unknown + motor_vehicle=unknown + motorcar=unknown + +assign psvaccess + or bus=yes|designated|urban + switch motorcar= + switch motor_vehicle= + switch vehicle= + access=psv|hov + vehicle=psv|hov + motor_vehicle=psv|hov + motorcar=psv|hov + +assign accessspeedlimit = if caraccess then 999 else 0 + +assign isroundabout = junction=roundabout|circular +assign implicitoneway = or isroundabout highway=motorway +assign isbadoneway = if reversedirection=yes then ( if oneway= then implicitoneway else oneway=yes|true|1 ) else oneway=-1 +assign onewayspeedlimit = if isbadoneway then 0 else 999 + +assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link + +assign maxspeed_surface = + switch or surface= surface=paved|asphalt|concrete 999 + switch surface=paving_stones|cobblestone 30 + 2 + +assign maxspeed_tracktype = + switch tracktype= 999 + switch tracktype=grade1 40 + switch tracktype=grade2 5 + 1 + +assign maxspeed_implicit = + switch highway=motorway 999 + switch highway=motorway_link 130 + switch highway=trunk 250 + switch highway=trunk_link 100 + switch highway=primary|primary_link 100 + switch highway=secondary|secondary_link 90 + switch highway=tertiary|tertiary_link 80 + switch highway=unclassified 50 + switch route=ferry 10 + switch highway=bridleway 10 + switch highway=residential|living_street 30 + switch highway=service 30 + switch highway=track|road|path switch tracktype=grade1 30 5 + 0 + +assign maxspeed = + min onewayspeedlimit + min accessspeedlimit + switch maxspeed=50 50 + switch maxspeed=30 30 + switch maxspeed=10 10 + switch maxspeed=20 20 + switch maxspeed=40 40 + switch maxspeed=60 60 + switch maxspeed=70 70 + switch maxspeed=80 80 + switch maxspeed=90 90 + switch maxspeed=100 100 + switch maxspeed=110 110 + switch maxspeed=120 120 + switch maxspeed=130 130 + switch maxspeed=urban 50 + switch maxspeed=rural 100 + min maxspeed_implicit + min maxspeed_surface maxspeed_tracktype + +assign minspeed = + switch highway=motorway|trunk 75 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 ( highway=residential|living_street ) 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 + else 0 + +assign costfactor = if equal maxspeed 0 + then ( if ( and equal accessspeedlimit 0 and greater onewayspeedlimit 0 and greater priorityclassifier 20 not psvaccess ) + then switch unknowncaraccess 9997 9998 + else 10000 ) + else 0 + +# some more classifying bits used for voice hint generation... + +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 ( and highway=track tracktype=grade1 ) then true + else false + +# ... encoded into a bitmask + +assign classifiermask add isbadoneway + add multiply isgoodoneway 2 + add multiply isroundabout 4 + add multiply islinktype 8 + add multiply isgoodforcars 16 + multiply highway=residential|living_street 32 + + +---context:node # following code refers to node tags + +# +# calculate logical car access to nodes +# +assign caraccess + switch motorcar= + switch motor_vehicle= + switch vehicle= + switch access= + not barrier=gate|bollard|lift_gate|cycle_barrier + access=yes|permissive|designated|destination + vehicle=yes|permissive|designated|destination + motor_vehicle=yes|permissive|designated|destination + motorcar=yes|permissive|designated|destination + +assign initialcost = + + switch caraccess + 0 + 1000000 + +assign maxspeed = + + if or crossing=traffic_signals highway=traffic_signals + then + switch greater way:priorityclassifier 24 5 + switch greater way:priorityclassifier 22 3 + switch greater way:priorityclassifier 20 1 + 0 + else 999 diff --git a/misc/profiles2/car-eco.brf b/misc/profiles2/car-eco.brf index f1ab2e6..a840f07 100644 --- a/misc/profiles2/car-eco.brf +++ b/misc/profiles2/car-eco.brf @@ -63,7 +63,9 @@ assign caraccess_destination assign accessspeedlimit = if caraccess then 999 else 0 -assign isbadoneway = if reversedirection=yes then ( if oneway= then junction=roundabout else oneway=yes|true|1 ) else oneway=-1 +assign isroundabout = junction=roundabout|circular +assign implicitoneway = or isroundabout highway=motorway +assign isbadoneway = if reversedirection=yes then ( if oneway= then implicitoneway else oneway=yes|true|1 ) else oneway=-1 assign onewayspeedlimit = if isbadoneway then 0 else 999 assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link|tertiary_link @@ -145,8 +147,7 @@ assign priorityclassifier = # some more classifying bits used for voice hint generation... assign isgoodoneway = if reversedirection=yes then oneway=-1 - else if oneway= then junction=roundabout else oneway=yes|true|1 -assign isroundabout = junction=roundabout + 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 ( and highway=track tracktype=grade1 ) then true diff --git a/misc/profiles2/lookups.dat b/misc/profiles2/lookups.dat index 3826d05..0869e57 100644 --- a/misc/profiles2/lookups.dat +++ b/misc/profiles2/lookups.dat @@ -1,5 +1,5 @@ ---lookupversion:10 ----minorversion:7 +---minorversion:8 ---context:way @@ -116,6 +116,8 @@ access;0000099899 agricultural forestry access;0000039934 designated official access;0000011813 customers access;0000004007 delivery +access;0000000100 psv +access;0000000100 hov foot;0001659694 yes allowed Yes foot;0000424847 designated official @@ -144,6 +146,8 @@ motorcar;0000008733 private motorcar;0000005757 designated official motorcar;0000004116 permissive motorcar;0000000979 restricted +motorcar;0000000100 psv +motorcar;0000000100 hov motor_vehicle;0000212692 no motor_vehicle;0000184982 yes @@ -152,7 +156,9 @@ motor_vehicle;0000032622 agricultural forestry agricultural;forestry agricultura motor_vehicle;0000025396 designated official motor_vehicle;0000025092 destination motor_vehicle;0000010895 permissive -motor_vehicle;0000000175 emergency +motor_vehicle;0000000175 emergency Emergency +motor_vehicle;0000000100 psv +motor_vehicle;0000000100 hov motorcycle;0000092079 no motorcycle;0000027978 yes @@ -161,6 +167,8 @@ motorcycle;0000008862 destination motorcycle;0000004877 designated official motorcycle;0000003936 private motorcycle;0000002209 permissive +motorcycle;0000000100 psv +motorcycle;0000000100 hov vehicle;0000030218 no vehicle;0000013333 destination @@ -169,6 +177,8 @@ vehicle;0000007147 agricultural forestry agricultural;forestry vehicle;0000006305 private vehicle;0000001294 permissive vehicle;0000000105 designated +vehicle;0000000100 psv +vehicle;0000000100 hov horse;0000227398 no horse;0000144432 yes @@ -281,6 +291,7 @@ junction;0000321066 roundabout junction;0000002828 spui junction;0000002134 jughandle junction;0000001493 approach +junction;0000000100 circular bridge;0001842517 yes viaduct true suspension @@ -547,6 +558,12 @@ indoor;0000000099 steps concrete;0000000043 plates concrete;0000000013 lanes +bus;0001178365 yes +bus;0000006419 designated +bus;0000005602 no +bus;0000001424 urban + + ---context:node highway;0001314954 bus_stop