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 5fca4002a6e867ad2592625e0acda3da502da447..78eac5f5221d77ed69d9234f8593ffc4ae7ec952 100644 (file)
--- a/settings/import-admin.lua
+++ b/settings/import-admin.lua
@@ -2,12 +2,38 @@ local flex = require('flex-base')
 
 flex.set_main_tags{
     boundary = {administrative = 'named'},
 
 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',
 }
 
 flex.set_prefilters{delete_keys = {'building', 'source', 'highway',
                                    'addr:housenumber', 'addr:street', 'addr:city',

+                                   'addr:interpolation',

                                    'source', '*source', 'type',
                                    'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'source', '*source', 'type',
                                    'is_in:postcode', '*:wikidata', '*:wikipedia',
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',