Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-street.lua b/settings/import-street.lua
index 34bff5725fa91d31bfb658b23c18007ba1428f0d..68ad48bdf89305619612ffb629f1310ac3a89c6e 100644 (file)
--- a/settings/import-street.lua
+++ b/settings/import-street.lua
@@ -1,4 +1,4 @@
-flex = require('flex-base')
+local flex = require('flex-base')
 
 flex.set_main_tags{
     highway = {'always',
@@ -16,7 +16,8 @@ flex.set_main_tags{
                primary_link = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},
-    boundary = {administrative = 'named'},
+    boundary = {administrative = 'named',
+                postal_code = 'always'},
     landuse = 'fallback',
     place = 'always'
 }
@@ -24,7 +25,7 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'addr:housenumber', 'addr:street',
                                    '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'},
@@ -32,7 +33,7 @@ flex.set_prefilters{delete_keys = {'building', 'source',
                                               'noexit', 'crossing', 'give_way', 'stop'},
                                    landuse = {'cemetry', 'no'},
                                    boundary = {'place'}},
-                    extratag_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital', 'area'}
+                    extra_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital', 'area'}
                    }
 
 flex.set_name_tags{main = {'name', 'name:*',
@@ -44,7 +45,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'}
@@ -64,3 +65,5 @@ flex.set_address_tags{main = {'addr:housenumber',
                      }
 
 flex.set_unused_handling{extra_keys = {'place'}}
+
+return flex