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

Bump api_version to 3 in car.lua

Browse Source
This commit is contained in:
Michael Krasnyk 2017-09-21 15:18:11 +02:00
parent a7c1967ca0
commit fec2b602a2
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/options/extract/lua.feature
View File

@ -53,7 +53,7 @@ Feature: osrm-extract lua ways:get_nodes()
""" """
functions = require('testbot') functions = require('testbot')
function way_function(profile, way, result, location_data) function way_function(profile, way, result, relations, location_data)
assert(location_data) assert(location_data)
for k, v in pairs(location_data) do print (k .. ' ' .. tostring(v)) end for k, v in pairs(location_data) do print (k .. ' ' .. tostring(v)) end
result.forward_mode = mode.driving result.forward_mode = mode.driving
@ -83,7 +83,7 @@ Feature: osrm-extract lua ways:get_nodes()
""" """
functions = require('testbot') functions = require('testbot')
function way_function(profile, way, result, location_data) function way_function(profile, way, result, relations, location_data)
assert(location_data) assert(location_data)
print('ISO3166-1 ' .. (location_data['ISO3166-1'] or 'none')) print('ISO3166-1 ' .. (location_data['ISO3166-1'] or 'none'))
result.forward_mode = mode.driving result.forward_mode = mode.driving

7
profiles/car.lua
View File

@ -1,6 +1,6 @@
-- Car profile -- Car profile
api_version = 2 api_version = 3
Set = require('lib/set') Set = require('lib/set')
Sequence = require('lib/sequence') Sequence = require('lib/sequence')
@ -303,7 +303,7 @@ function process_node(profile, node, result)
end end
end end
function process_way(profile, way, result, location_data) function process_way(profile, way, result, relations, location_data)
-- the intial filtering of ways based on presence of tags -- the intial filtering of ways based on presence of tags
-- affects processing times significantly, because all ways -- affects processing times significantly, because all ways
-- have to be checked. -- have to be checked.
@ -387,7 +387,8 @@ function process_way(profile, way, result, location_data)
WayHandlers.weights WayHandlers.weights
} }
WayHandlers.run(profile, way, result, data, handlers, location_data) print (profile, way, result, data, handlers, relations, location_data)
WayHandlers.run(profile, way, result, data, handlers, relations, location_data)
end end
function process_turn(profile, turn) function process_turn(profile, turn)

6
profiles/lib/way_handlers.lua
View File

@ -552,7 +552,7 @@ function WayHandlers.blocked_ways(profile,way,result,data)
end end
end end
function WayHandlers.driving_side(profile, way, result, data, location_data) function WayHandlers.driving_side(profile, way, result, data, relations, location_data)
local driving_side = way:get_value_by_key("driving_side") local driving_side = way:get_value_by_key("driving_side")
if driving_side == 'left' then if driving_side == 'left' then
result.is_left_hand_driving = true result.is_left_hand_driving = true
@ -584,9 +584,9 @@ end
-- if the handler chain should be aborted. -- if the handler chain should be aborted.
-- To ensure the correct order of method calls, use a Sequence of handler names. -- To ensure the correct order of method calls, use a Sequence of handler names.
function WayHandlers.run(profile, way, result, data, handlers, location_data) function WayHandlers.run(profile, way, result, data, handlers, relatons, location_data)
for i,handler in ipairs(handlers) do for i,handler in ipairs(handlers) do
if handler(profile, way, result, data, location_data) == false then if handler(profile, way, result, data, relatons, location_data) == false then
return false return false
end end
end end

2
profiles/testbot.lua
View File

@ -5,7 +5,7 @@
-- Secondary road: 18km/h = 18000m/3600s = 100m/20s -- Secondary road: 18km/h = 18000m/3600s = 100m/20s
-- Tertiary road: 12km/h = 12000m/3600s = 100m/30s -- Tertiary road: 12km/h = 12000m/3600s = 100m/30s
api_version = 2 api_version = 3
function setup() function setup()
return { return {