return name and reference separately
This commit is contained in:
committed by
Moritz Kobitzsch
parent
938dff011f
commit
dcc1b5ab2b
+5
-9
@@ -387,14 +387,14 @@ function way_function (way, result)
|
||||
local has_name = name and "" ~= name
|
||||
local has_pronunciation = pronunciation and "" ~= pronunciation
|
||||
|
||||
if has_name and has_ref then
|
||||
result.name = name .. " (" .. ref .. ")"
|
||||
elseif has_ref then
|
||||
result.name = ref
|
||||
elseif has_name then
|
||||
if has_name then
|
||||
result.name = name
|
||||
end
|
||||
|
||||
if has_ref then
|
||||
result.ref = ref
|
||||
end
|
||||
|
||||
if has_pronunciation then
|
||||
result.pronunciation = pronunciation
|
||||
end
|
||||
@@ -456,10 +456,6 @@ function way_function (way, result)
|
||||
local destination = get_destination(way)
|
||||
local has_destination = destination and "" ~= destination
|
||||
|
||||
if has_destination and has_name and not has_ref then
|
||||
result.name = name .. " (" .. destination .. ")"
|
||||
end
|
||||
|
||||
result.destinations = destination
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user