diff --git a/misc/profiles2/car-eco.brf b/misc/profiles2/car-eco.brf index a840f07..d029da5 100644 --- a/misc/profiles2/car-eco.brf +++ b/misc/profiles2/car-eco.brf @@ -23,12 +23,16 @@ assign p_standby = 250 # Watt assign validForCars = true assign pass1coefficient = 1.3 -assign turnInstructionMode = 1 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style +assign turnInstructionMode = 2 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style + +# classifier constants + +assign classifier_none = 1 +assign classifier_ferry = 2 + ---context:way # following code refers to way-tags -assign initialcost switch route=ferry 20000 0 - # # calculate logical car access # @@ -61,18 +65,33 @@ assign caraccess_destination motor_vehicle=destination motorcar=destination +# +# for any change in initialclassifier, initialcost is added once +# +assign initialclassifier = + if route=ferry then classifier_ferry + else classifier_none + + +# +# calculate the initial cost +# this is added to the total cost each time the costfactor +# changed +# +assign initialcost = + if ( equal initialclassifier classifier_ferry ) then 10000 + else 0 + 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 isbadoneway = if reversedirection=yes then ( if oneway= then junction=roundabout 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 + switch surface=paving_stones|cobblestone|sett 30 2 assign maxspeed_tracktype = @@ -97,9 +116,43 @@ assign maxspeed_implicit = switch highway=track|road|path switch tracktype=grade1 30 5 0 -assign maxspeed = - min onewayspeedlimit - min accessspeedlimit +assign maxspeed_forward = + switch maxspeed:forward=50 50 + switch maxspeed:forward=30 30 + switch maxspeed:forward=10 10 + switch maxspeed:forward=20 20 + switch maxspeed:forward=40 40 + switch maxspeed:forward=60 60 + switch maxspeed:forward=70 70 + switch maxspeed:forward=80 80 + switch maxspeed:forward=90 90 + switch maxspeed:forward=100 100 + switch maxspeed:forward=110 110 + switch maxspeed:forward=120 120 + switch maxspeed:forward=130 130 + switch maxspeed:forward=urban 50 + switch maxspeed:forward=rural 100 + 999 + +assign maxspeed_backward = + switch maxspeed:backward=50 50 + switch maxspeed:backward=30 30 + switch maxspeed:backward=10 10 + switch maxspeed:backward=20 20 + switch maxspeed:backward=40 40 + switch maxspeed:backward=60 60 + switch maxspeed:backward=70 70 + switch maxspeed:backward=80 80 + switch maxspeed:backward=90 90 + switch maxspeed:backward=100 100 + switch maxspeed:backward=110 110 + switch maxspeed:backward=120 120 + switch maxspeed:backward=130 130 + switch maxspeed:backward=urban 50 + switch maxspeed:backward=rural 100 + 999 + +assign maxspeed_explicit = switch maxspeed=50 50 switch maxspeed=30 30 switch maxspeed=10 10 @@ -115,13 +168,19 @@ assign maxspeed = switch maxspeed=130 130 switch maxspeed=urban 50 switch maxspeed=rural 100 + if reversedirection=yes then maxspeed_backward else maxspeed_forward + +assign maxspeed = + min onewayspeedlimit + min accessspeedlimit + min maxspeed_explicit min maxspeed_implicit min maxspeed_surface maxspeed_tracktype assign costfactor = if equal maxspeed 0 then 10000 else 0 assign minspeed = - switch highway=motorway|trunk 75 0 + switch highway=motorway|motorway_link|trunk 75 0 # way priorities used for voice hint generation @@ -147,7 +206,8 @@ assign priorityclassifier = # 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 + 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 ( and highway=track tracktype=grade1 ) then true @@ -163,7 +223,6 @@ assign classifiermask add isbadoneway add multiply highway=residential|living_street 32 multiply caraccess_destination 64 - ---context:node # following code refers to node tags # diff --git a/misc/profiles2/car-fast.brf b/misc/profiles2/car-fast.brf index 2a8a733..e449b88 100644 --- a/misc/profiles2/car-fast.brf +++ b/misc/profiles2/car-fast.brf @@ -23,12 +23,16 @@ assign p_standby = 250 # Watt assign validForCars = true assign pass1coefficient = 1.3 -assign turnInstructionMode = 1 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style +assign turnInstructionMode = 2 # 0=none, 1=auto-choose, 2=locus-style, 3=osmand-style + +# classifier constants + +assign classifier_none = 1 +assign classifier_ferry = 2 + ---context:way # following code refers to way-tags -assign initialcost switch route=ferry 20000 0 - # # calculate logical car access # @@ -61,18 +65,33 @@ assign caraccess_destination motor_vehicle=destination motorcar=destination +# +# for any change in initialclassifier, initialcost is added once +# +assign initialclassifier = + if route=ferry then classifier_ferry + else classifier_none + + +# +# calculate the initial cost +# this is added to the total cost each time the costfactor +# changed +# +assign initialcost = + if ( equal initialclassifier classifier_ferry ) then 10000 + else 0 + 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 isbadoneway = if reversedirection=yes then ( if oneway= then junction=roundabout 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 + switch surface=paving_stones|cobblestone|sett 30 2 assign maxspeed_tracktype = @@ -97,9 +116,43 @@ assign maxspeed_implicit = switch highway=track|road|path switch tracktype=grade1 30 5 0 -assign maxspeed = - min onewayspeedlimit - min accessspeedlimit +assign maxspeed_forward = + switch maxspeed:forward=50 50 + switch maxspeed:forward=30 30 + switch maxspeed:forward=10 10 + switch maxspeed:forward=20 20 + switch maxspeed:forward=40 40 + switch maxspeed:forward=60 60 + switch maxspeed:forward=70 70 + switch maxspeed:forward=80 80 + switch maxspeed:forward=90 90 + switch maxspeed:forward=100 100 + switch maxspeed:forward=110 110 + switch maxspeed:forward=120 120 + switch maxspeed:forward=130 130 + switch maxspeed:forward=urban 50 + switch maxspeed:forward=rural 100 + 999 + +assign maxspeed_backward = + switch maxspeed:backward=50 50 + switch maxspeed:backward=30 30 + switch maxspeed:backward=10 10 + switch maxspeed:backward=20 20 + switch maxspeed:backward=40 40 + switch maxspeed:backward=60 60 + switch maxspeed:backward=70 70 + switch maxspeed:backward=80 80 + switch maxspeed:backward=90 90 + switch maxspeed:backward=100 100 + switch maxspeed:backward=110 110 + switch maxspeed:backward=120 120 + switch maxspeed:backward=130 130 + switch maxspeed:backward=urban 50 + switch maxspeed:backward=rural 100 + 999 + +assign maxspeed_explicit = switch maxspeed=50 50 switch maxspeed=30 30 switch maxspeed=10 10 @@ -115,13 +168,19 @@ assign maxspeed = switch maxspeed=130 130 switch maxspeed=urban 50 switch maxspeed=rural 100 + if reversedirection=yes then maxspeed_backward else maxspeed_forward + +assign maxspeed = + min onewayspeedlimit + min accessspeedlimit + min maxspeed_explicit min maxspeed_implicit min maxspeed_surface maxspeed_tracktype assign costfactor = if equal maxspeed 0 then 10000 else 0 assign minspeed = - switch highway=motorway|trunk 75 0 + switch highway=motorway|motorway_link|trunk 75 0 # way priorities used for voice hint generation @@ -147,7 +206,8 @@ assign priorityclassifier = # 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 + 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 ( and highway=track tracktype=grade1 ) then true @@ -163,7 +223,6 @@ assign classifiermask add isbadoneway add multiply highway=residential|living_street 32 multiply caraccess_destination 64 - ---context:node # following code refers to node tags # diff --git a/misc/profiles2/car-vario.brf b/misc/profiles2/car-vario.brf index 346c106..d029da5 100644 --- a/misc/profiles2/car-vario.brf +++ b/misc/profiles2/car-vario.brf @@ -91,7 +91,7 @@ assign islinktype = highway=motorway_link|trunk_link|primary_link|secondary_link assign maxspeed_surface = switch or surface= surface=paved|asphalt|concrete 999 - switch surface=paving_stones|cobblestone 30 + switch surface=paving_stones|cobblestone|sett 30 2 assign maxspeed_tracktype =