X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2ca83efc36a96cfa070be61c7422d255044130f3..c24dc56c65456cda52da04f7d87af93d7b7a7acf:/settings/import-admin.lua

diff --git a/settings/import-admin.lua b/settings/import-admin.lua
index d45fa8fb..78eac5f5 100644
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -1,21 +1,47 @@
-flex = require('flex-base')
+local flex = require('flex-base')
 
 flex.set_main_tags{
     boundary = {administrative = 'named'},
-    landuse = 'fallback',
-    place = 'always'
+    landuse = {residential = 'fallback',
+               farm = 'fallback',
+               farmyard = 'fallback',
+               industrial = 'fallback',
+               commercial = 'fallback',
+               allotments = 'fallback',
+               retail = 'fallback'},
+    place = {county = 'always',
+             district = 'always',
+             municipality = 'always',
+             city = 'always',
+             town = 'always',
+             borough = 'always',
+             village = 'always',
+             suburb = 'always',
+             hamlet = 'always',
+             croft = 'always',
+             subdivision = 'always',
+             allotments = 'always',
+             neighbourhood = 'always',
+             quarter = 'always',
+             isolated_dwelling = 'always',
+             farm = 'always',
+             city_block = 'always',
+             mountain_pass = 'always',
+             square = 'always',
+             locality = 'always'}
 }
 
 flex.set_prefilters{delete_keys = {'building', 'source', 'highway',
                                    'addr:housenumber', 'addr:street', 'addr:city',
+                                   'addr:interpolation',
                                    '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 +53,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 +68,5 @@ flex.set_address_tags{extra = {'addr:*', 'is_in:*'},
                      }
 
 flex.set_unused_handling{extra_keys = {'place'}}
+
+return flex