diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua index 1ee6faae3e6..7bbc621c89e 100644 --- a/profiles/bicycle.lua +++ b/profiles/bicycle.lua @@ -225,7 +225,7 @@ function way_function (way, result) end -- roundabout handling - if junction and "roundabout" == junction or "mini_roundabout" == highway then + if junction and "roundabout" == junction then result.roundabout = true end @@ -285,7 +285,7 @@ function way_function (way, result) else -- biking not allowed, maybe we can push our bike? -- essentially requires pedestrian profiling, for example foot=no mean we can't push a bike - if foot ~= 'no' and junction ~= "roundabout" and highway ~= "mini_roundabout" then + if foot ~= 'no' and junction ~= "roundabout" then if pedestrian_speeds[highway] then -- pedestrian-only ways and areas result.forward_speed = pedestrian_speeds[highway] @@ -317,7 +317,7 @@ function way_function (way, result) -- direction local impliedOneway = false - if junction == "roundabout" or highway == "mini_roundabout" or highway == "motorway" then + if junction == "roundabout" or highway == "motorway" then impliedOneway = true end @@ -357,7 +357,7 @@ function way_function (way, result) -- pushing bikes if bicycle_speeds[highway] or pedestrian_speeds[highway] then - if foot ~= "no" and junction ~= "roundabout" and highway ~= "mini_roundabout" then + if foot ~= "no" and junction ~= "roundabout" then if result.backward_mode == mode.inaccessible then result.backward_speed = walking_speed result.backward_mode = mode.pushing_bike diff --git a/profiles/car.lua b/profiles/car.lua index b685f28b8c4..becf502c060 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -372,7 +372,7 @@ function way_function (way, result) result.pronunciation = pronunciation end - if junction and ("roundabout" == junction or "mini_roundabout" == highway) then + if junction and "roundabout" == junction then result.roundabout = true end @@ -394,7 +394,6 @@ function way_function (way, result) oneway == "1" or oneway == "true" or junction == "roundabout" or - highway == "mini_roundabout" or (highway == "motorway" and oneway ~= "no") then result.backward_mode = mode.inaccessible diff --git a/profiles/foot.lua b/profiles/foot.lua index f377001cc7d..002f06d7874 100644 --- a/profiles/foot.lua +++ b/profiles/foot.lua @@ -162,7 +162,7 @@ function way_function (way, result) end -- roundabouts - if "roundabout" == junction or "mini_roundabout" == highway then + if "roundabout" == junction then result.roundabout = true end diff --git a/profiles/testbot.lua b/profiles/testbot.lua index 4922498c136..8bad8100ca7 100644 --- a/profiles/testbot.lua +++ b/profiles/testbot.lua @@ -103,11 +103,11 @@ function way_function (way, result) -- nothing to do elseif oneway == "-1" then result.forward_mode = mode.inaccessible - elseif oneway == "yes" or oneway == "1" or oneway == "true" or junction == "roundabout" or highway == "mini_roundabout" then + elseif oneway == "yes" or oneway == "1" or oneway == "true" or junction == "roundabout" then result.backward_mode = mode.inaccessible end - if junction == 'roundabout' or highway == 'mini_roundabout' then + if junction == 'roundabout' then result.roundabout = true end end