From 9125481aed58ce5adc6862094961e88b40fa6d8e Mon Sep 17 00:00:00 2001 From: quaelnix <122357328+quaelnix@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:33:34 +0200 Subject: [PATCH 1/3] Fix regression in fastbike profile https://github.com/abrensch/brouter/commit/e66468b091506833eb5890656a0ef3a538397ab2 broke the logic that handled highway=path. This patch reverts the problematic change in behavior. See: https://github.com/nrenner/brouter-web/issues/756 --- misc/profiles2/fastbike.brf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf index 1c48994..ab21a45 100644 --- a/misc/profiles2/fastbike.brf +++ b/misc/profiles2/fastbike.brf @@ -261,8 +261,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 From 188280b448b16131d7819e8ab659ed2641f4017c Mon Sep 17 00:00:00 2001 From: quaelnix <122357328+quaelnix@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:48:16 +0200 Subject: [PATCH 2/3] Fix regression in trekking profile The 'avoid_path' logic which was added in https://github.com/abrensch/brouter/commit/89b71c2bfbffe885ad4f6d59b697161f4abaa514 ignores the cycleroute logic and makes no sense. --- misc/profiles2/trekking.brf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf index 011ee43..a08e361 100644 --- a/misc/profiles2/trekking.brf +++ b/misc/profiles2/trekking.brf @@ -300,8 +300,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 ) From 38fc780055e789ee1beb85b5e4439be7a38d8adc Mon Sep 17 00:00:00 2001 From: quaelnix <122357328+quaelnix@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:52:28 +0200 Subject: [PATCH 3/3] Remove unused profile options --- misc/profiles2/fastbike.brf | 2 -- misc/profiles2/hiking-mountain.brf | 1 - misc/profiles2/trekking.brf | 1 - 3 files changed, 4 deletions(-) diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf index ab21a45..c303154 100644 --- a/misc/profiles2/fastbike.brf +++ b/misc/profiles2/fastbike.brf @@ -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 diff --git a/misc/profiles2/hiking-mountain.brf b/misc/profiles2/hiking-mountain.brf index fc61759..c4ce1bc 100644 --- a/misc/profiles2/hiking-mountain.brf +++ b/misc/profiles2/hiking-mountain.brf @@ -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 diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf index a08e361..3c8841a 100644 --- a/misc/profiles2/trekking.brf +++ b/misc/profiles2/trekking.brf @@ -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