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

flex: switch to functions for substyles

Browse Source 
This gives us a bit more flexibility about the implementation
in the future.
This commit is contained in:
Sarah Hoffmann 2022-12-15 22:10:19 +01:00
parent a915815e4d
commit 093d531509
2 changed files with 86 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
settings/flex-base.lua
View File

@ -46,7 +46,6 @@ function Place.new(object, geom_func)
end
function Place:clean(data)
if data.delete ~= nil or data.extra ~= nil then
for k, v in pairs(self.object.tags) do
if data.delete ~= nil and data.delete(k, v) then
self.object.tags[k] = nil
@ -55,7 +54,6 @@ function Place:clean(data)
self.object.tags[k] = nil
end
end
end
end
function Place:delete(data)
@ -182,6 +180,7 @@ function Place:grab_name_parts(data)
if atype ~= nil then
self.names[k] = v
self.object.tags[k] = nil
if atype == 'main' then
self.has_name = true
elseif atype == 'house' then
@ -487,6 +486,40 @@ function module.process_tags(o)
end
end
--------- Convenience functions for simple style configuration -----------------
function module.set_prefilters(data)
module.PRE_DELETE = module.tag_match{keys = data.delete_keys, tags = data.delete_tags}
module.PRE_EXTRAS = module.tag_match{keys = data.extratag_keys,
tags = data.extratag_tags}
end
function module.set_main_tags(data)
module.MAIN_KEYS = data
end
function module.set_name_tags(data)
module.NAMES = module.tag_group(data)
end
function module.set_address_tags(data)
module.ADDRESS_TAGS = module.tag_group(data)
end
function module.set_unused_handling(data)
if data.extra_keys == nil and data.extra_tags == nil then
module.POST_DELETE = module.tag_match{data.delete_keys, tags = data.delete_tags}
module.POST_EXTRAS = nil
module.SAVE_EXTRA_MAINS = true
elseif data.delete_keys == nil and data.delete_tags == nil then
module.POST_DELETE = nil
module.POST_EXTRAS = module.tag_match{data.extra_keys, tags = data.extra_tags}
module.SAVE_EXTRA_MAINS = false
else
error("unused handler can have only 'extra_keys' or 'delete_keys' set.")
end
end
------ defaults --------------
module.RELATION_TYPES = {

21
settings/import-extratags.lua
View File

@ -1,6 +1,6 @@
flex = require('flex-base')
flex.MAIN_KEYS = {
flex.set_main_tags{
building = 'fallback',
emergency = 'always',
healthcare = 'fallback',
@ -45,14 +45,13 @@ flex.MAIN_KEYS = {
place = 'always'
}
flex.PRE_DELETE = flex.tag_match{keys = {'note', 'note:*', 'source', 'source*', 'attribution',
flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attribution',
'comment', 'fixme', 'FIXME', 'created_by', 'NHD:*',
'nhd:*', 'gnis:*', 'geobase:*', 'KSJ2:*', 'yh:*',
'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*',
'type', 'lacounty:*', 'ref:ruian:*', 'building:ruian:type',
'ref:linz:*', 'is_in:postcode'},
tags = {emergency = {'yes', 'no', 'fire_hydrant'},
delete_tags = {emergency = {'yes', 'no', 'fire_hydrant'},
historic = {'yes', 'no'},
military = {'yes', 'no'},
natural = {'yes', 'no', 'coastline'},
@ -74,18 +73,14 @@ flex.PRE_DELETE = flex.tag_match{keys = {'note', 'note:*', 'source', 'source*',
tunnel = {'no'},
waterway = {'riverbank'},
building = {'no'},
boundary = {'place'}}
}
flex.POST_DELETE = flex.tag_match{keys = {'tiger:*'}}
flex.PRE_EXTRAS = flex.tag_match{keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
boundary = {'place'}},
extratag_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
'name:etymology', 'name:signed', 'name:botanical',
'wikidata', '*:wikidata',
'addr:street:name', 'addr:street:type'}
}
flex.NAMES = flex.tag_group{main = {'name', 'name:*',
flex.set_name_tags{main = {'name', 'name:*',
'int_name', 'int_name:*',
'nat_name', 'nat_name:*',
'reg_name', 'reg_name:*',
@ -101,7 +96,7 @@ flex.NAMES = flex.tag_group{main = {'name', 'name:*',
house = {'addr:housename'}
}
flex.ADDRESS_TAGS = flex.tag_group{main = {'addr:housenumber',
flex.set_address_tags{main = {'addr:housenumber',
'addr:conscriptionnumber',
'addr:streetnumber'},
extra = {'addr:*', 'is_in:*', 'tiger:county'},
@ -113,5 +108,5 @@ flex.ADDRESS_TAGS = flex.tag_group{main = {'addr:housenumber',
interpolation = {'addr:interpolation'}
}
flex.SAVE_EXTRA_MAINS = true
flex.set_unused_handling{delete_keys = {'tiger:*'}}