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 a1164acc5060f550c04dc64a1d678d71ed953e5a..5fca4002a6e867ad2592625e0acda3da502da447 100644 (file)
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -9,7 +9,7 @@ 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'},
@@ -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'}