Merge pull request #3172 from lonvia/query-timeout

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

diff --git a/settings/import-full.lua b/settings/import-full.lua
index a932fa50e38dc263790e3378a543ed6ffdb11726..1dc317a9bc0f5e1b4c9bcbd3d1ee4e1a6996f449 100644 (file)
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -7,7 +7,6 @@ flex.set_main_tags{
     historic = 'always',
     military = 'always',
     natural = 'named',
-    landuse = 'named',
     highway = {'always',
                street_lamp = 'named',
                traffic_signals = 'named',
@@ -27,7 +26,7 @@ flex.set_main_tags{
     man_made = 'always',
     aerialway = 'always',
     boundary = {'named',
-                postal_code = 'named'},
+                postal_code = 'always'},
     aeroway = 'always',
     amenity = 'always',
     club = 'always',
@@ -50,7 +49,11 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    'nhd:*', 'gnis:*', 'geobase:*', 'KSJ2:*', 'yh:*',
                                    'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*',
                                    'type', 'lacounty:*', 'ref:ruian:*', 'building:ruian:type',
-                                   'ref:linz:*', 'is_in:postcode'},
+                                   'ref:linz:*', 'is_in:postcode',
+                                   '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
+                                   'name:etymology', 'name:signed', 'name:botanical',
+                                   '*:wikidata', '*:wikipedia', 'brand:wikipedia:*',
+                                   'addr:street:name', 'addr:street:type'},
                     delete_tags = {emergency = {'yes', 'no', 'fire_hydrant'},
                                    historic = {'yes', 'no'},
                                    military = {'yes', 'no'},
@@ -74,10 +77,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    waterway = {'riverbank'},
                                    building = {'no'},
                                    boundary = {'place'}},
-                    extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
-                               'name:etymology', 'name:signed', 'name:botanical',
-                               'wikidata', '*:wikidata',
-                               'addr:street:name', 'addr:street:type'}
+                    extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}
                    }
 
 flex.set_name_tags{main = {'name', 'name:*',