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

fixing lua issue in profile

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-06-28 11:00:01 +02:00
parent 8fdbe965cc
commit 375331b80c
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
features/guidance/turn-lanes.feature
View File

@ -107,6 +107,24 @@ Feature: Turn Lane Guidance
| a,d | road,turn,turn | depart,turn right,arrive | ,straight:false right:true, | | a,d | road,turn,turn | depart,turn right,arrive | ,straight:false right:true, |
| a,c | road,road,road | depart,use lane straight,arrive | ,straight:true right:false, | | a,c | road,road,road | depart,use lane straight,arrive | ,straight:true right:false, |
@PROFILE @LANES
Scenario: Turn with Bus-Lane but without lanes
Given the node map
| a | | b | | c |
| | | | | |
| | | d | | |
And the ways
| nodes | name | lanes:psv |
| ab | road | 1 |
| bc | road | yes |
| bd | turn | |
When I route I should get
| waypoints | route | turns |
| a,d | road,turn,turn | depart,turn right,arrive |
| a,c | road,road | depart,arrive |
#turn lanes are often drawn at the incoming road, even though the actual turn requires crossing the intersection first #turn lanes are often drawn at the incoming road, even though the actual turn requires crossing the intersection first
@todo @WORKAROUND-FIXME @bug @todo @WORKAROUND-FIXME @bug
Scenario: Turn Lanes at Segregated Road Scenario: Turn Lanes at Segregated Road

14
profiles/car.lua
View File

@ -189,7 +189,7 @@ local function getPSVCounts(way)
if( psv_backward and psv_backward ~= "" ) then if( psv_backward and psv_backward ~= "" ) then
bw = tonumber(psv_backward); bw = tonumber(psv_backward);
if( bw == nil ) then if( bw == nil ) then
fw = 0 bw = 0
end end
end end
return fw, bw return fw, bw
@ -206,11 +206,17 @@ local function getTurnLanes(way)
local turn_lanes_bw = way:get_value_by_key("turn:lanes:backward") local turn_lanes_bw = way:get_value_by_key("turn:lanes:backward")
if( fw_psv ~= 0 or bw_psv ~= 0 ) then if( fw_psv ~= 0 or bw_psv ~= 0 ) then
if turn_lanes and turn_lanes ~= "" then
turn_lanes = trimLaneString(turn_lanes, bw_psv, fw_psv ) turn_lanes = trimLaneString(turn_lanes, bw_psv, fw_psv )
end
if turn_lanes_fw and turn_lanes_fw ~= "" then
turn_lanes_fw = trimLaneString(turn_lanes_fw, bw_psv, fw_psv ) turn_lanes_fw = trimLaneString(turn_lanes_fw, bw_psv, fw_psv )
end
--backwards turn lanes need to treat bw_psv as fw_psv and vice versa --backwards turn lanes need to treat bw_psv as fw_psv and vice versa
if turn_lanes_bw and turn_lanes_bw ~= "" then
turn_lanes_bw = trimLaneString(turn_lanes_bw, fw_psv, bw_psv ) turn_lanes_bw = trimLaneString(turn_lanes_bw, fw_psv, bw_psv )
end end
end
return turn_lanes, turn_lanes_fw, turn_lanes_bw return turn_lanes, turn_lanes_fw, turn_lanes_bw
end end
@ -427,15 +433,15 @@ function way_function (way, result)
local turn_lanes_backward = "" local turn_lanes_backward = ""
turn_lanes, turn_lanes_forward, turn_lanes_backward = getTurnLanes(way) turn_lanes, turn_lanes_forward, turn_lanes_backward = getTurnLanes(way)
if( turn_lanes ~= "" ) then if turn_lanes and turn_lanes ~= "" then
result.turn_lanes_forward = turn_lanes; result.turn_lanes_forward = turn_lanes;
result.turn_lanes_backward = turn_lanes; result.turn_lanes_backward = turn_lanes;
else else
if( turn_lanes_forward ~= "" ) then if turn_lanes_forward and turn_lanes_forward ~= "" then
result.turn_lanes_forward = turn_lanes_forward; result.turn_lanes_forward = turn_lanes_forward;
end end
if( turn_lanes_backward ~= "" ) then if turn_lanes_backward and turn_lanes_backward ~= "" then
result.turn_lanes_backward = turn_lanes_backward; result.turn_lanes_backward = turn_lanes_backward;
end end
end end