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

…utes Remove cycleroute always having access granted
abrensch · Apr 2, 2023 · b7842e1 · b7842e1
2 parents 5d56bb9 + e2c6811
commit b7842e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf
@@ -87,14 +87,13 @@ assign defaultaccess
 # calculate logical bike access
 #
 assign bikeaccess =
-       or any_cycleroute
-          switch bicycle=
-                 switch bicycle_road=yes
-                    true
-                    switch vehicle=
-                           ( if highway=footway then false else defaultaccess )
-                           not vehicle=private|no
-                 not or bicycle=private or bicycle=no bicycle=dismount
+       switch bicycle=
+              switch bicycle_road=yes
+                 true
+                 switch vehicle=
+                        ( if highway=footway then false else defaultaccess )
+                        not vehicle=private|no
+              not or bicycle=private or bicycle=no bicycle=dismount
 
 #
 # calculate logical foot access
@@ -115,7 +114,9 @@ assign accesspenalty
               0
               switch footaccess
                      6
-                     10000
+                     switch any_cycleroute
+                            15
+                            10000
 
 #
 # handle one-ways. On primary roads, wrong-oneways should

diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf
@@ -112,8 +112,7 @@ assign defaultaccess =
 # calculate logical bike access
 #
 assign bikeaccess =
-       if any_cycleroute then true
-       else if bicycle= then
+       if bicycle= then
        (
          if bicycle_road=yes then true
          else if vehicle= then ( if highway=footway then false else defaultaccess )
@@ -137,6 +136,7 @@ assign footaccess =
 assign accesspenalty =
        if bikeaccess then 0
        else if footaccess then 4
+       else if any_cycleroute then 15
        else 10000
 
 #