X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2ca83efc36a96cfa070be61c7422d255044130f3..37940803273aeab88ae37f8f6c9698478df52fc2:/settings/import-full.lua diff --git a/settings/import-full.lua b/settings/import-full.lua index e00313ce..1dc317a9 100644 --- a/settings/import-full.lua +++ b/settings/import-full.lua @@ -1,4 +1,4 @@ -flex = require('flex-base') +local flex = require('flex-base') flex.set_main_tags{ building = 'fallback', @@ -7,7 +7,6 @@ flex.set_main_tags{ historic = 'always', military = 'always', natural = 'named', - landuse = 'named', highway = {'always', street_lamp = 'named', traffic_signals = 'named', @@ -27,7 +26,7 @@ flex.set_main_tags{ man_made = 'always', aerialway = 'always', boundary = {'named', - postal_code = 'named'}, + postal_code = 'always'}, aeroway = 'always', amenity = 'always', club = 'always', @@ -50,7 +49,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,10 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri waterway = {'riverbank'}, building = {'no'}, boundary = {'place'}}, - extratag_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*', - 'name:etymology', 'name:signed', 'name:botanical', - 'wikidata', '*:wikidata', - 'addr:street:name', 'addr:street:type'} + extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'} } flex.set_name_tags{main = {'name', 'name:*', @@ -110,3 +110,5 @@ flex.set_address_tags{main = {'addr:housenumber', flex.set_unused_handling{extra_keys = {'place'}} + +return flex