Merge pull request #471 from Totorrr/profiles-no-total-access-cycleroutes

Remove cycleroute always having access granted
This commit is contained in:
afischerdev 2023-04-02 18:01:06 +02:00 committed by GitHub
commit b7842e1722
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions

View file

@ -87,14 +87,13 @@ assign defaultaccess
# calculate logical bike access # calculate logical bike access
# #
assign bikeaccess = assign bikeaccess =
or any_cycleroute switch bicycle=
switch bicycle= switch bicycle_road=yes
switch bicycle_road=yes true
true switch vehicle=
switch vehicle= ( if highway=footway then false else defaultaccess )
( if highway=footway then false else defaultaccess ) not vehicle=private|no
not vehicle=private|no not or bicycle=private or bicycle=no bicycle=dismount
not or bicycle=private or bicycle=no bicycle=dismount
# #
# calculate logical foot access # calculate logical foot access
@ -115,7 +114,9 @@ assign accesspenalty
0 0
switch footaccess switch footaccess
6 6
10000 switch any_cycleroute
15
10000
# #
# handle one-ways. On primary roads, wrong-oneways should # handle one-ways. On primary roads, wrong-oneways should

View file

@ -112,8 +112,7 @@ assign defaultaccess =
# calculate logical bike access # calculate logical bike access
# #
assign bikeaccess = assign bikeaccess =
if any_cycleroute then true if bicycle= then
else if bicycle= then
( (
if bicycle_road=yes then true if bicycle_road=yes then true
else if vehicle= then ( if highway=footway then false else defaultaccess ) else if vehicle= then ( if highway=footway then false else defaultaccess )
@ -137,6 +136,7 @@ assign footaccess =
assign accesspenalty = assign accesspenalty =
if bikeaccess then 0 if bikeaccess then 0
else if footaccess then 4 else if footaccess then 4
else if any_cycleroute then 15
else 10000 else 10000
# #