Merge pull request #593 from quaelnix/fix-fastbike-regression
Fix profile regressions
This commit is contained in:
commit
ff73608f0a
3 changed files with 2 additions and 8 deletions
|
@ -24,8 +24,6 @@ assign allow_ferries = true # %allow_ferries% | set to false to disall
|
|||
assign allow_motorways = false # %allow_motorways% | Set to true to allow motorways (useful in Asia / Oceania for example) | boolean
|
||||
assign ignore_cycleroutes = false # %ignore_cycleroutes% | Set to true for better elevation results | boolean
|
||||
assign stick_to_cycleroutes = false # %stick_to_cycleroutes% | Set to true to just follow cycleroutes | boolean
|
||||
assign avoid_unsafe = false # %avoid_unsafe% | Set to true to avoid standard highways | boolean
|
||||
assign avoid_path = false # %avoid_path% | Set to true to avoid pathes | boolean
|
||||
|
||||
assign consider_traffic = false # %consider_traffic% | Activate to avoid traffic | boolean
|
||||
assign consider_noise = false # %consider_noise% | Activate to prefer a low-noise route | boolean
|
||||
|
@ -261,8 +259,7 @@ assign costfactor
|
|||
switch highway=cycleway 1.3
|
||||
switch isresidentialorliving switch isunpaved 10 1.2
|
||||
switch highway=service switch isunpaved 10 1.2
|
||||
switch highway=path switch avoid_path 2.1 1.1
|
||||
switch or highway=track or highway=road highway=footway
|
||||
switch or highway=track or highway=road or highway=path highway=footway
|
||||
switch tracktype=grade1 switch isunpaved 3 1.2
|
||||
switch tracktype=grade2 switch isunpaved 10 3
|
||||
switch tracktype=grade3 10.0
|
||||
|
|
|
@ -15,7 +15,6 @@ assign consider_noise = false # %consider_noise% | Activate to prefe
|
|||
assign consider_river = false # %consider_river% | Activate to prefer a route along rivers or sees | boolean
|
||||
assign consider_forest = false # %consider_forest% | Activate to prefer a route in forest or green areas| boolean
|
||||
assign consider_town = false # %consider_town% | Activate to bypass cities / big towns as far as possible | boolean
|
||||
assign avoid_path = false # %avoid_path% | Activate to avoid pathes | boolean
|
||||
assign consider_traffic = 1 # %consider_traffic% | how do you plan to drive the tour? | [1=as cyclist alone in the week, 0.5=as cyclist alone at weekend, 0.3 =with a group of cyclists, 0.1=with a group of cyclists at week-end]
|
||||
|
||||
assign shortest_way 0 # 0 as default, duplicate shortest standard profile, SAC access limit ignored for now
|
||||
|
|
|
@ -14,7 +14,6 @@ assign allow_ferries = true # %allow_ferries% | Set false to disa
|
|||
assign ignore_cycleroutes = false # %ignore_cycleroutes% | Set true for better elevation results | boolean
|
||||
assign stick_to_cycleroutes = false # %stick_to_cycleroutes% | Set true to just follow cycleroutes | boolean
|
||||
assign avoid_unsafe = false # %avoid_unsafe% | Set true to avoid standard highways | boolean
|
||||
assign avoid_path = false # %avoid_path% | Set true to avoid pathes | boolean
|
||||
|
||||
assign consider_noise = false # %consider_noise% | Activate to prefer a low-noise route | boolean
|
||||
assign consider_river = false # %consider_river% | Activate to prefer a route along rivers or sees | boolean
|
||||
|
@ -300,8 +299,7 @@ assign costfactor
|
|||
#
|
||||
else if ( highway=track|road|path|footway ) then
|
||||
(
|
||||
if ( and highway=path avoid_path ) then ( 10.0 )
|
||||
else if ( tracktype=grade1 ) then ( if probablyGood then 1.0 else 1.3 )
|
||||
if ( tracktype=grade1 ) then ( if probablyGood then 1.0 else 1.3 )
|
||||
else if ( tracktype=grade2 ) then ( if probablyGood then 1.1 else 2.0 )
|
||||
else if ( tracktype=grade3 ) then ( if probablyGood then 1.5 else 3.0 )
|
||||
else if ( tracktype=grade4 ) then ( if probablyGood then 2.0 else 5.0 )
|
||||
|
|
Loading…
Reference in a new issue