diff --git a/brouter-routing-app/assets/profiles2.zip b/brouter-routing-app/assets/profiles2.zip index 9912472..0b7a618 100644 Binary files a/brouter-routing-app/assets/profiles2.zip and b/brouter-routing-app/assets/profiles2.zip differ diff --git a/misc/profiles2/car-test.brf b/misc/profiles2/car-test.brf index f5cf731..4036b70 100644 --- a/misc/profiles2/car-test.brf +++ b/misc/profiles2/car-test.brf @@ -18,7 +18,7 @@ assign pass1coefficient 1.3 ---context:way # following code refers to way-tags -assign turncost 200 +assign turncost if junction=roundabout then 0 else 200 assign initialcost switch route=ferry 20000 0 @@ -70,10 +70,10 @@ assign costfactor switch or highway=motorway highway=motorway_link 1 switch or highway=trunk highway=trunk_link 1 - switch or highway=primary highway=primary_link switch maxspeed=30 2.0 switch maxspeed=50 1.5 1.2 - switch or highway=secondary highway=secondary_link 1.3 - switch or highway=tertiary highway=tertiary_link 1.4 - switch highway=unclassified 1.5 + switch or highway=primary highway=primary_link switch maxspeed=30 2.0 switch maxspeed=50 1.5 1.3 + switch or highway=secondary highway=secondary_link 1.4 + switch or highway=tertiary highway=tertiary_link 1.5 + switch highway=unclassified 1.6 switch route=ferry 5.67 switch highway=bridleway 5 switch or highway=residential highway=living_street 2 diff --git a/misc/profiles2/fastbike-lowtraffic.brf b/misc/profiles2/fastbike-lowtraffic.brf index c210b85..9e4e9af 100644 --- a/misc/profiles2/fastbike-lowtraffic.brf +++ b/misc/profiles2/fastbike-lowtraffic.brf @@ -37,7 +37,8 @@ assign nodeaccessgranted or any_cycleroute lcn=yes assign ispaved or surface=paved or surface=asphalt or surface=concrete surface=paving_stones assign isunpaved not or surface= or ispaved or surface=fine_gravel surface=cobblestone -assign turncost 90 +assign turncost = if junction=roundabout then 0 + else 90 assign initialcost switch route=ferry 10000 0 diff --git a/misc/profiles2/fastbike.brf b/misc/profiles2/fastbike.brf index 9b76885..9993dfc 100644 --- a/misc/profiles2/fastbike.brf +++ b/misc/profiles2/fastbike.brf @@ -35,7 +35,8 @@ assign nodeaccessgranted or any_cycleroute lcn=yes assign ispaved or surface=paved or surface=asphalt or surface=concrete surface=paving_stones assign isunpaved not or surface= or ispaved or surface=fine_gravel surface=cobblestone -assign turncost 90 +assign turncost = if junction=roundabout then 0 + else 90 assign initialcost switch route=ferry 10000 0 diff --git a/misc/profiles2/moped.brf b/misc/profiles2/moped.brf index fe8211b..feb9a32 100644 --- a/misc/profiles2/moped.brf +++ b/misc/profiles2/moped.brf @@ -18,7 +18,9 @@ assign validForCars 1 ---context:way # following code refers to way-tags -assign turncost 90 +assign turncost = if junction=roundabout then 0 + else 90 + assign initialcost switch route=ferry 20000 0 diff --git a/misc/profiles2/trekking.brf b/misc/profiles2/trekking.brf index e6c3dc0..09838e3 100644 --- a/misc/profiles2/trekking.brf +++ b/misc/profiles2/trekking.brf @@ -63,7 +63,9 @@ assign probablyGood = or ispaved and isbike not isunpaved # (Suppressing turncost while following longdistance-cycleways # makes them a little bit more magnetic) # -assign turncost = if is_ldcr then 0 else 90 +assign turncost = if is_ldcr then 0 + else if junction=roundabout then 0 + else 90 #