Merge pull request #3353 from mtmail/add-codespell

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

diff --git a/settings/import-admin.lua b/settings/import-admin.lua
index d45fa8fb380e9c38bb1321bb54ae2409830aeefe..78eac5f5221d77ed69d9234f8593ffc4ae7ec952 100644 (file)
--- 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'},
 
 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',
                                    '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'}},
                                    '*: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:*',
                    }
 
 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:*',
                           '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'}


@@ -42,3 +68,5 @@ flex.set_address_tags{extra = {'addr:*', 'is_in:*'},
                      }
 
 flex.set_unused_handling{extra_keys = {'place'}}
                      }
 
 flex.set_unused_handling{extra_keys = {'place'}}

+
+return flex