Skip to content

[lua] Added to_number_uint. #7289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vng wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

[lua] Added to_number_uint. #7289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions profiles/lib/guidance.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ parking_class = Set{
'emergency_access'
}

local function to_number_uint(s)
local n = tonumber(s)
if n ~= nil and n > 0 and n % 1 == 0 then
return n
end
return nil
end

function Guidance.set_classification (highway, result, input_way)
if motorway_types[highway] then
result.road_classification.motorway_class = true
Expand Down Expand Up @@ -107,22 +115,22 @@ function Guidance.set_classification (highway, result, input_way)

local lane_count = input_way:get_value_by_key("lanes")
if lane_count then
local lc = tonumber(lane_count)
local lc = to_number_uint(lane_count)
if lc ~= nil then
result.road_classification.num_lanes = lc
end
else
local total_count = 0
local forward_count = input_way:get_value_by_key("lanes:forward")
if forward_count then
local fc = tonumber(forward_count)
local fc = to_number_uint(forward_count)
if fc ~= nil then
total_count = fc
end
end
local backward_count = input_way:get_value_by_key("lanes:backward")
if backward_count then
local bc = tonumber(backward_count)
local bc = to_number_uint(backward_count)
if bc ~= nil then
total_count = total_count + bc
end
Expand All @@ -137,10 +145,10 @@ end
local function get_psv_counts(way,data)
local psv_forward, psv_backward = Tags.get_forward_backward_by_key(way,data,'lanes:psv')
if psv_forward then
psv_forward = tonumber(psv_forward)
psv_forward = to_number_uint(psv_forward)
end
if psv_backward then
psv_backward = tonumber(psv_backward)
psv_backward = to_number_uint(psv_backward)
end
return psv_forward or 0,
psv_backward or 0
Expand Down
Loading