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

lua: cleanup handle_blocking(), move common cases up early

Browse Source
This commit is contained in:
Emil Tin 2016-11-12 23:05:14 +01:00 committed by Patrick Niklaus
parent 9e361a8178
commit 9aeb3086cb
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
profiles/car.lua
View File

@ -303,35 +303,17 @@ function handle_hov(way,result,cache)
end end
end end
-- handle squares and other areas
function handle_area(way,result,cache)
-- we dont route over areas
local area = TagCache.get(way,cache,"area")
if ignore_areas and area and "yes" == area then
return false
end
end
-- handle toll roads
function handle_toll(way,result,cache)
-- respect user-preference for toll=yes ways
local toll = TagCache.get(way,cache,"toll")
if ignore_toll_ways and toll and "yes" == toll then
return false
end
end
-- handle various that can block access -- handle various that can block access
function handle_blocking(way,result,cache) function handle_blocking(way,result,cache)
if handle_area(way,result,cache) == false then -- we dont route over areas
local area = TagCache.get(way,cache,"area")
if ignore_areas and "yes" == area then
return false return false
end end
if handle_hov(way,result,cache) == false then -- respect user-preference for toll=yes ways
return false local toll = TagCache.get(way,cache,"toll")
end if ignore_toll_ways and "yes" == toll then
if handle_toll(way,result,cache) == false then
return false return false
end end
@ -352,6 +334,10 @@ function handle_blocking(way,result,cache)
if "impassable" == status then if "impassable" == status then
return false return false
end end
if handle_hov(way,result,cache) == false then
return false
end
end end
-- set default mode -- set default mode