diff --git a/misc/profiles2/Hiking-Alpine-SAC6-private.brf b/misc/profiles2/Hiking-Alpine-SAC6-private.brf index d5f7491..672626c 100644 --- a/misc/profiles2/Hiking-Alpine-SAC6-private.brf +++ b/misc/profiles2/Hiking-Alpine-SAC6-private.brf @@ -27,7 +27,7 @@ assign path_preference 0.0 # 0.0 as default, try 20.0 to penalize non assign SAC_scale_limit 6 # 0..6, 0 to avoid any SAC paths, 1 for T1 as maximum, 6 for T6 as maximum # all paths with sac_scale higher than SAC_scale_limit are forbidden. -assign SAC_scale_preferred 4 # The same, but the preferred SAC scale level. Level below are slightly, above strongly penalized +assign SAC_scale_preferred 3 # The same, but the preferred SAC scale level. Level below are slightly, above strongly penalized assign SAC_access_penalty 9000 # costfactor 9999 means the most horrible but allowed road., # 100000=forbidden. This makes difference if forbidden way is the only option. assign SAC_K1 0.05 # Penalizing of SAC levels below preferred diff --git a/misc/profiles2/Hiking-Alpine-SAC6.brf b/misc/profiles2/Hiking-Alpine-SAC6.brf index aa8737e..02f3f8b 100644 --- a/misc/profiles2/Hiking-Alpine-SAC6.brf +++ b/misc/profiles2/Hiking-Alpine-SAC6.brf @@ -27,7 +27,7 @@ assign path_preference 0.0 # 0.0 as default, try 20.0 to penalize non assign SAC_scale_limit 6 # 0..6, 0 to avoid any SAC paths, 1 for T1 as maximum, 6 for T6 as maximum # all paths with sac_scale higher than SAC_scale_limit are forbidden. -assign SAC_scale_preferred 4 # The same, but the preferred SAC scale level. Level below are slightly, above strongly penalized +assign SAC_scale_preferred 3 # The same, but the preferred SAC scale level. Level below are slightly, above strongly penalized assign SAC_access_penalty 9000 # costfactor 9999 means the most horrible but allowed road., # 100000=forbidden. This makes difference if forbidden way is the only option. assign SAC_K1 0.05 # Penalizing of SAC levels below preferred diff --git a/misc/profiles2/MTB-private.brf b/misc/profiles2/MTB-private.brf index 86264f4..b3ddc1d 100644 --- a/misc/profiles2/MTB-private.brf +++ b/misc/profiles2/MTB-private.brf @@ -274,14 +274,26 @@ assign mtb_scale_penalty if not consider_smoothness then 0.0 else # Remember this is for trekking bikes, not MTB. There are MTB dedicated profiles. # http://wiki.openstreetmap.org/wiki/Key:mtb:scale -if mtb:scale= then 0.0 else if mtb:scale=0- then 0.0 else -if mtb:scale=0 then 0.0 else if mtb:scale=0+ then 0.3 else -if mtb:scale=1- then 0.7 else if mtb:scale=1 then 1.2 else -if mtb:scale=1+ then 1.8 else if mtb:scale=2- then 2.5 else -if mtb:scale=2 then 5.0 else if mtb:scale=2+ then 10.0 else -if mtb:scale=3 then 15.0 else -if mtb:scale=4|5|6 then 9000 - else 0.0 +if mtb:scale= then + if sac_scale=difficult_alpine_hiking then 9000 + else if sac_scale=demanding_alpine_hiking then 9000 + else if sac_scale=alpine_hiking then 15.0 + else if sac_scale=demanding_mountain_hiking then 10.0 + else if sac_scale=mountain_hiking then 5.0 + else if sac_scale=hiking|T1-hiking|yes then 0.0 + else 0.0 +else if mtb:scale=0- then 0.0 +else if mtb:scale=0 then 0.0 +else if mtb:scale=0+ then 0.3 +else if mtb:scale=1- then 0.7 +else if mtb:scale=1 then 1.2 +else if mtb:scale=1+ then 1.8 +else if mtb:scale=2- then 2.5 +else if mtb:scale=2 then 5.0 +else if mtb:scale=2+ then 10.0 +else if mtb:scale=3 then 15.0 +else if mtb:scale=4|5|6 then 9000 +else 0.0 assign roughness_penalty max smoothness_penalty max mtb_scale_penalty ( if ford=yes then ford_costfactor else 0 )