Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / import-admin.lua

diff --git a/settings/import-admin.lua b/settings/import-admin.lua
index d45fa8fb380e9c38bb1321bb54ae2409830aeefe..5fca4002a6e867ad2592625e0acda3da502da447 100644 (file)
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -1,4 +1,4 @@
-flex = require('flex-base')
+local flex = require('flex-base')
 
 flex.set_main_tags{
     boundary = {administrative = 'named'},
@@ -9,13 +9,13 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source', 'highway',
                                    'addr:housenumber', 'addr:street', 'addr:city',
                                    'source', '*source', 'type',
-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
                     delete_tags = {landuse = {'cemetry', 'no'},
                                    boundary = {'place'}},
-                    extratag_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital'}
+                    extra_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital'}
                    }
 
 flex.set_name_tags{main = {'name', 'name:*',
@@ -27,7 +27,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}
@@ -42,3 +42,5 @@ flex.set_address_tags{extra = {'addr:*', 'is_in:*'},
                      }
 
 flex.set_unused_handling{extra_keys = {'place'}}
+
+return flex