osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-26 13:27:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3011 from lonvia/fix-flex-scripts

Browse Source 
Fix extra tag handling in some flex scripts
This commit is contained in:
Sarah Hoffmann 2023-03-21 09:58:53 +01:00 committed by GitHub
commit 434bd5a5bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
settings/flex-base.lua
View File

@ -223,9 +223,9 @@ function Place:write_row(k, v, save_extra_mains)
return 0
end
if save_extra_mains then
if save_extra_mains ~= nil then
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
end
end
@ -243,7 +243,9 @@ function Place:write_row(k, v, save_extra_mains)
if save_extra_mains then
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
@ -437,7 +439,7 @@ function module.process_tags(o)
return
end
o:clean{delete = POST_DELETE, extra = POST_EXTRAS}
o:clean{delete = POST_DELETE}
-- collect main keys
for k, v in pairs(o.object.tags) do
@ -485,12 +487,10 @@ end
function module.set_unused_handling(data)
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_EXTRAS = nil
SAVE_EXTRA_MAINS = true
SAVE_EXTRA_MAINS = function() return true end
elseif data.delete_keys == nil and data.delete_tags == nil then
POST_DELETE = nil
POST_EXTRAS = module.tag_match{keys = data.extra_keys, tags = data.extra_tags}
SAVE_EXTRA_MAINS = false
SAVE_EXTRA_MAINS = module.tag_match{keys = data.extra_keys, tags = data.extra_tags}
else
error("unused handler can have only 'extra_keys' or 'delete_keys' set.")
end

12
settings/import-full.lua
View File

@ -50,7 +50,11 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
'nhd:*', 'gnis:*', 'geobase:*', 'KSJ2:*', 'yh:*',
'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*',
'type', 'lacounty:*', 'ref:ruian:*', 'building:ruian:type',
'ref:linz:*', 'is_in:postcode'},
'ref:linz:*', 'is_in:postcode',
'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
'name:etymology', 'name:signed', 'name:botanical',
'*:wikidata', '*:wikipedia', 'brand:wikipedia:*',
'addr:street:name', 'addr:street:type'},
delete_tags = {emergency = {'yes', 'no', 'fire_hydrant'},
historic = {'yes', 'no'},
military = {'yes', 'no'},
@ -74,11 +78,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
waterway = {'riverbank'},
building = {'no'},
boundary = {'place'}},
extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
'name:etymology', 'name:signed', 'name:botanical',
'wikidata', '*:wikidata',
'*:wikipedia', 'brand:wikipedia:*',
'addr:street:name', 'addr:street:type'}
extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}
}
flex.set_name_tags{main = {'name', 'name:*',