osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-22 21:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of unused extra tags

Browse Source 
The tags can only be moved to extra tags after the main tags have been
handled.
This commit is contained in:
Sarah Hoffmann 2023-03-20 21:20:27 +01:00
parent a8bedb6ab9
commit 114cc776be
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
settings/flex-base.lua
View File

@ -223,14 +223,15 @@ function Place:write_row(k, v, save_extra_mains)
return 0 return 0
end end
if save_extra_mains then if save_extra_mains ~= nil then
for extra_k, extra_v in pairs(self.object.tags) do for extra_k, extra_v in pairs(self.object.tags) do
if extra_k ~= k then if extra_k ~= k and save_extra_mains(extra_k, extra_v) then
self.extratags[extra_k] = extra_v self.extratags[extra_k] = extra_v
end end
end end
end end
print(k, v)
place_table:insert{ place_table:insert{
class = k, class = k,
type = v, type = v,
@ -243,7 +244,9 @@ function Place:write_row(k, v, save_extra_mains)
if save_extra_mains then if save_extra_mains then
for k, v in pairs(self.object.tags) do for k, v in pairs(self.object.tags) do
self.extratags[k] = nil if save_extra_mains(k, v) then
self.extratags[k] = nil
end
end end
end end
@ -437,7 +440,7 @@ function module.process_tags(o)
return return
end end
o:clean{delete = POST_DELETE, extra = POST_EXTRAS} o:clean{delete = POST_DELETE}
-- collect main keys -- collect main keys
for k, v in pairs(o.object.tags) do for k, v in pairs(o.object.tags) do
@ -485,12 +488,10 @@ end
function module.set_unused_handling(data) function module.set_unused_handling(data)
if data.extra_keys == nil and data.extra_tags == nil then if data.extra_keys == nil and data.extra_tags == nil then
POST_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags} POST_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags}
POST_EXTRAS = nil SAVE_EXTRA_MAINS = function() return true end
SAVE_EXTRA_MAINS = true
elseif data.delete_keys == nil and data.delete_tags == nil then elseif data.delete_keys == nil and data.delete_tags == nil then
POST_DELETE = nil POST_DELETE = nil
POST_EXTRAS = module.tag_match{keys = data.extra_keys, tags = data.extra_tags} SAVE_EXTRA_MAINS = module.tag_match{keys = data.extra_keys, tags = data.extra_tags}
SAVE_EXTRA_MAINS = false
else else
error("unused handler can have only 'extra_keys' or 'delete_keys' set.") error("unused handler can have only 'extra_keys' or 'delete_keys' set.")
end end