Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions misc/profiles2/fastbike-verylowtraffic.brf
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,28 @@ assign badoneway =
else oneway=yes|true|1
else oneway=-1

assign hascycleway = not
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) and ( or cycleway:right= cycleway:right=no ) ( or cycleway:both= cycleway:both=no )

assign onewaypenalty =
if ( badoneway ) then
(
if ( cycleway=opposite|opposite_lane|opposite_track ) then 0
else if ( cycleway:left=opposite|opposite_lane|opposite_track ) then 0
else if ( cycleway:right=opposite|opposite_lane|opposite_track ) then 0
if (
and hascycleway
or and cycleway:left=lane|track|shared_lane|share_busway
cycleway:left:oneway=no|-1
or and cycleway:right=lane|track|shared_lane|share_busway
cycleway:right:oneway=no|-1
or and cycleway:both=lane|track|shared_lane|share_busway
or cycleway:both:oneway=no|-1
or cycleway:left:oneway=no|-1
cycleway:right:oneway=no|-1
or cycleway=opposite|opposite_lane|opposite_track
or cycleway:left=opposite|opposite_lane|opposite_track
cycleway:right=opposite|opposite_lane|opposite_track
) then 0
else if ( oneway:bicycle=no ) then 0
else if ( cycleway:left:oneway=no ) then 0
else if ( cycleway:right:oneway=no ) then 0
else if ( not footaccess ) then 100
else if ( junction=roundabout|circular ) then 60
else if ( highway=primary|primary_link ) then 50
else if ( highway=secondary|secondary_link ) then 30
Expand All @@ -157,9 +170,6 @@ 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 consider_traffic then
(
Expand Down
6 changes: 5 additions & 1 deletion misc/profiles2/fastbike.brf
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ assign badoneway =
else oneway=-1

assign hascycleway = not
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no )
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) and ( or cycleway:right= cycleway:right=no ) ( or cycleway:both= cycleway:both=no )

assign onewaypenalty =
if ( badoneway ) then
Expand All @@ -158,6 +158,10 @@ assign onewaypenalty =
cycleway:left:oneway=no|-1
or and cycleway:right=lane|track|shared_lane|share_busway
cycleway:right:oneway=no|-1
or and cycleway:both=lane|track|shared_lane|share_busway
or cycleway:both:oneway=no|-1
or cycleway:left:oneway=no|-1
cycleway:right:oneway=no|-1
or cycleway=opposite|opposite_lane|opposite_track
or cycleway:left=opposite|opposite_lane|opposite_track
cycleway:right=opposite|opposite_lane|opposite_track
Expand Down
5 changes: 4 additions & 1 deletion misc/profiles2/lookups.dat
Original file line number Diff line number Diff line change
Expand Up @@ -692,12 +692,15 @@ busway:right;0000000001 lane
cycleway:left:oneway;0000000769 yes
cycleway:left:oneway;0000001595 no
cycleway:left:oneway;0000000927 -1
cycleway:right:oneway;0000000001 -1

cycleway:right:oneway;0000003084 yes
cycleway:right:oneway;0000002499 no
cycleway:right:oneway;0000000017 -1

cycleway:both:oneway;0000002930 yes
cycleway:both:oneway;0000000585 no
cycleway:both:oneway;0000000001 -1

zone:maxspeed;0000001616 20 DE:20 FR:20
zone:maxspeed;0000063721 30 DE:30 FR:30 BE:30 HU:30 NO:30 AT:30 ES:30 NL:30 IT:30 CZ:30

Expand Down
18 changes: 16 additions & 2 deletions misc/profiles2/mtb.brf
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ assign any_cycleroute
assign isotherroad = not or istrack ismainroad

assign hascycleway = not
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no )
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) and ( or cycleway:right= cycleway:right=no ) ( or cycleway:both= cycleway:both=no )

#2.6.* inserted originalisbike option
assign isbike_candidate or bicycle=yes|permissive|designated or hascycleway
Expand Down Expand Up @@ -253,8 +253,22 @@ assign any_cycleroute

assign onewaypenalty =
if ( badoneway ) then
if cycleway=opposite|opposite_lane|opposite_track then 0
if (
and hascycleway
or and cycleway:left=lane|track|shared_lane|share_busway
cycleway:left:oneway=no|-1
or and cycleway:right=lane|track|shared_lane|share_busway
cycleway:right:oneway=no|-1
or and cycleway:both=lane|track|shared_lane|share_busway
or cycleway:both:oneway=no|-1
or cycleway:left:oneway=no|-1
cycleway:right:oneway=no|-1
or cycleway=opposite|opposite_lane|opposite_track
or cycleway:left=opposite|opposite_lane|opposite_track
cycleway:right=opposite|opposite_lane|opposite_track
) then 0
else if oneway:bicycle=no then 0
else if not footaccess then 100
else if junction=roundabout|circular then 60
else if highway=primary|primary_link then 50
else if highway=secondary|secondary_link then 30
Expand Down
8 changes: 6 additions & 2 deletions misc/profiles2/trekking.brf
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ assign is_ldcr =

# set isbike considering access, local cycle route or the presence of a cycleway on the highway
assign hasbikerouteoraccess =
or bicycle_road=yes or bicycle=yes|permissive|designated lcn=yes # also add cyclestreet=yes when lookup has it
or bicycle_road=yes or cyclestreet=yes or bicycle=yes|permissive|designated lcn=yes

assign hascycleway = not
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) ( or cycleway:right= cycleway:right=no ) # also add cycleway:both when lookup has it
and ( or cycleway= cycleway=no|none ) and ( or cycleway:left= cycleway:left=no ) and ( or cycleway:right= cycleway:right=no ) ( or cycleway:both= cycleway:both=no )

assign isbike = or hasbikerouteoraccess hascycleway

Expand Down Expand Up @@ -193,6 +193,10 @@ assign onewaypenalty =
cycleway:left:oneway=no|-1
or and cycleway:right=lane|track|shared_lane|share_busway
cycleway:right:oneway=no|-1
or and cycleway:both=lane|track|shared_lane|share_busway
or cycleway:both:oneway=no|-1
or cycleway:left:oneway=no|-1
cycleway:right:oneway=no|-1
or cycleway=opposite|opposite_lane|opposite_track
or cycleway:left=opposite|opposite_lane|opposite_track
cycleway:right=opposite|opposite_lane|opposite_track
Expand Down
Loading