Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Revert "Handle small roundabouts, fixes #516."

Browse Source 
This reverts commit 7641b12b08.

Conflicts:
	profiles/bicycle.lua
	profiles/car.lua
This commit is contained in:
Daniel J. Hofmann 2016-06-02 15:03:28 +02:00
parent 27c4e8ddd0
commit ad70759f91
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
profiles/bicycle.lua
View File

@ -225,7 +225,7 @@ function way_function (way, result)
end end
-- roundabout handling -- roundabout handling
if junction and "roundabout" == junction or "mini_roundabout" == highway then if junction and "roundabout" == junction then
result.roundabout = true result.roundabout = true
end end
@ -285,7 +285,7 @@ function way_function (way, result)
else else
-- biking not allowed, maybe we can push our bike? -- biking not allowed, maybe we can push our bike?
-- essentially requires pedestrian profiling, for example foot=no mean we can't push a 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 if pedestrian_speeds[highway] then
-- pedestrian-only ways and areas -- pedestrian-only ways and areas
result.forward_speed = pedestrian_speeds[highway] result.forward_speed = pedestrian_speeds[highway]
@ -317,7 +317,7 @@ function way_function (way, result)
-- direction -- direction
local impliedOneway = false local impliedOneway = false
if junction == "roundabout" or highway == "mini_roundabout" or highway == "motorway" then if junction == "roundabout" or highway == "motorway" then
impliedOneway = true impliedOneway = true
end end
@ -357,7 +357,7 @@ function way_function (way, result)
-- pushing bikes -- pushing bikes
if bicycle_speeds[highway] or pedestrian_speeds[highway] then 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 if result.backward_mode == mode.inaccessible then
result.backward_speed = walking_speed result.backward_speed = walking_speed
result.backward_mode = mode.pushing_bike result.backward_mode = mode.pushing_bike

3
profiles/car.lua
View File

@ -372,7 +372,7 @@ function way_function (way, result)
result.pronunciation = pronunciation result.pronunciation = pronunciation
end end
if junction and ("roundabout" == junction or "mini_roundabout" == highway) then if junction and "roundabout" == junction then
result.roundabout = true result.roundabout = true
end end
@ -394,7 +394,6 @@ function way_function (way, result)
oneway == "1" or oneway == "1" or
oneway == "true" or oneway == "true" or
junction == "roundabout" or junction == "roundabout" or
highway == "mini_roundabout" or
(highway == "motorway" and oneway ~= "no") then (highway == "motorway" and oneway ~= "no") then
result.backward_mode = mode.inaccessible result.backward_mode = mode.inaccessible

2
profiles/foot.lua
View File

@ -162,7 +162,7 @@ function way_function (way, result)
end end
-- roundabouts -- roundabouts
if "roundabout" == junction or "mini_roundabout" == highway then if "roundabout" == junction then
result.roundabout = true result.roundabout = true
end end

4
profiles/testbot.lua
View File

@ -103,11 +103,11 @@ function way_function (way, result)
-- nothing to do -- nothing to do
elseif oneway == "-1" then elseif oneway == "-1" then
result.forward_mode = mode.inaccessible 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 result.backward_mode = mode.inaccessible
end end
if junction == 'roundabout' or highway == 'mini_roundabout' then if junction == 'roundabout' then
result.roundabout = true result.roundabout = true
end end
end end