Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-address.lua b/settings/import-address.lua
index 00d089ccd95af0219f83764cffe399bab28de23a..43248b02efb5a9f0c48b1c6508f144fdcf10cce5 100644 (file)
--- a/settings/import-address.lua
+++ b/settings/import-address.lua
@@ -17,14 +17,14 @@ flex.set_main_tags{
                secondary_link = 'named',
                tertiary_link = 'named'},
     boundary = {administrative = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},
     boundary = {administrative = 'named',

-                postal_code = 'named'},
+                postal_code = 'always'},

     landuse = 'fallback',
     place = 'always'
 }
 
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'source', '*source', 'type',
     landuse = 'fallback',
     place = 'always'
 }
 
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    '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'},
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},


@@ -44,7 +44,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_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'},
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'},