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

Access to location dependent data in Lua via way:get_location_tags()

Browse Source
This commit is contained in:
Michael Krasnyk
2017-09-22 14:03:12 +02:00
parent 2059f7234a
commit 0f498d13f5
8 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiles/bicycle.lua
+1 -1
View File
@@ -550,7 +550,7 @@ function process_way(profile, way, result)
WayHandlers.weights
}
WayHandlers.run(profile,way,result,data,handlers)
WayHandlers.run(profile, way, result, data, handlers)
end
function process_turn(profile, turn)
profiles/car.lua
+2 -3
View File
@@ -303,7 +303,7 @@ function process_node(profile, node, result)
end
end
function process_way(profile, way, result, relations, location_data)
function process_way(profile, way, result, relations)
-- the intial filtering of ways based on presence of tags
-- affects processing times significantly, because all ways
-- have to be checked.
@@ -387,8 +387,7 @@ function process_way(profile, way, result, relations, location_data)
WayHandlers.weights
}
print (profile, way, result, data, handlers, relations, location_data)
WayHandlers.run(profile, way, result, data, handlers, relations, location_data)
WayHandlers.run(profile, way, result, data, handlers, relations)
end
function process_turn(profile, turn)
profiles/foot.lua
+1 -1
View File
@@ -243,7 +243,7 @@ function process_way(profile, way, result)
WayHandlers.weights
}
WayHandlers.run(profile,way,result,data,handlers)
WayHandlers.run(profile, way, result, data, handlers)
end
function process_turn (profile, turn)
profiles/lib/way_handlers.lua
+11 -8
View File
@@ -552,16 +552,19 @@ function WayHandlers.blocked_ways(profile,way,result,data)
end
end
function WayHandlers.driving_side(profile, way, result, data, relations, location_data)
function WayHandlers.driving_side(profile, way, result, data)
local driving_side = way:get_value_by_key("driving_side")
if driving_side == 'left' then
result.is_left_hand_driving = true
elseif driving_side == 'right' then
result.is_left_hand_driving = false
elseif location_data then
result.is_left_hand_driving = location_data['driving_side'] == 'left'
elseif profile.left_hand_driving then
result.is_left_hand_driving = true
else
location_data = way:get_location_tags()
if location_data and location_data['driving_side'] then
result.is_left_hand_driving = location_data['driving_side'] == 'left'
else
result.is_left_hand_driving = profile.left_hand_driving
end
end
end
@@ -580,13 +583,13 @@ end
-- WayHandlers.run(handlers,way,result,data,profile)
--
-- Each method in the list will be called on the WayHandlers object.
-- All handlers must accept the parameteres (profile, way, result, data[, location_data]) and return false
-- All handlers must accept the parameteres (profile, way, result, data, relations) and return false
-- if the handler chain should be aborted.
-- To ensure the correct order of method calls, use a Sequence of handler names.
function WayHandlers.run(profile, way, result, data, handlers, relatons, location_data)
function WayHandlers.run(profile, way, result, data, handlers, relations)
for i,handler in ipairs(handlers) do
if handler(profile, way, result, data, relatons, location_data) == false then
if handler(profile, way, result, data, relations) == false then
return false
end
end