drop boundary=land_area

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

diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index fabc4aa1f1b4b7268d415db05a8aabfada5a89c6..edbbdf24a5656cede8a5d5fd1433e5b233007a64 100644 (file)
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -1,13 +1,12 @@
-flex = require('flex-base')
+local flex = require('flex-base')
 
-flex.MAIN_KEYS = {
+flex.set_main_tags{
     building = 'fallback',
     emergency = 'always',
     healthcare = 'fallback',
     historic = 'always',
     military = 'always',
     natural = 'named',
-    landuse = 'named',
     highway = {'always',
                street_lamp = 'named',
                traffic_signals = 'named',
@@ -27,14 +26,15 @@ flex.MAIN_KEYS = {
     man_made = 'always',
     aerialway = 'always',
     boundary = {'named',
-                postal_code = 'named'},
+                postal_code = 'always'},
     aeroway = 'always',
     amenity = 'always',
     club = 'always',
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',
-    leisure = 'always',
+    leisure = {'always',
+               nature_reserve = 'fallback'},
     office = 'always',
     mountain_pass = 'always',
     shop = 'always',
@@ -45,47 +45,43 @@ flex.MAIN_KEYS = {
     place = 'always'
 }
 
-
-flex.PRE_DELETE = flex.tag_match{keys = {'note', 'note:*', 'source', 'source*', 'attribution',
-                               'comment', 'fixme', 'FIXME', 'created_by', 'NHD:*',
-                               'nhd:*', 'gnis:*', 'geobase:*', 'KSJ2:*', 'yh:*',
-                               'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*',
-                               'type', 'lacounty:*', 'ref:ruian:*', 'building:ruian:type',
-                               'ref:linz:*', 'is_in:postcode'},
-                       tags = {emergency = {'yes', 'no', 'fire_hydrant'},
-                               historic = {'yes', 'no'},
-                               military = {'yes', 'no'},
-                               natural = {'yes', 'no', 'coastline'},
-                               highway = {'no', 'turning_circle', 'mini_roundabout',
-                                          'noexit', 'crossing', 'give_way', 'stop'},
-                               railway = {'level_crossing', 'no', 'rail'},
-                               man_made = {'survey_point', 'cutline'},
-                               aerialway = {'pylon', 'no'},
-                               aeroway = {'no'},
-                               amenity = {'no'},
-                               club = {'no'},
-                               craft = {'no'},
-                               leisure = {'no'},
-                               office = {'no'},
-                               mountain_pass = {'no'},
-                               shop = {'no'},
-                               tourism = {'yes', 'no'},
-                               bridge = {'no'},
-                               tunnel = {'no'},
-                               waterway = {'riverbank'},
-                               building = {'no'},
-                               boundary = {'place'}}
-                      }
-
-flex.POST_DELETE = flex.tag_match{keys = {'tiger:*'}}
-
-flex.PRE_EXTRAS = flex.tag_match{keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
+flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attribution',
+                                   'comment', 'fixme', 'FIXME', 'created_by', 'NHD:*',
+                                   'nhd:*', 'gnis:*', 'geobase:*', 'KSJ2:*', 'yh:*',
+                                   'osak:*', 'naptan:*', 'CLC:*', 'import', 'it:fvg:*',
+                                   'type', 'lacounty:*', 'ref:ruian:*', 'building:ruian:type',
+                                   'ref:linz:*', 'is_in:postcode'},
+                    delete_tags = {emergency = {'yes', 'no', 'fire_hydrant'},
+                                   historic = {'yes', 'no'},
+                                   military = {'yes', 'no'},
+                                   natural = {'yes', 'no', 'coastline'},
+                                   highway = {'no', 'turning_circle', 'mini_roundabout',
+                                              'noexit', 'crossing', 'give_way', 'stop'},
+                                   railway = {'level_crossing', 'no', 'rail'},
+                                   man_made = {'survey_point', 'cutline'},
+                                   aerialway = {'pylon', 'no'},
+                                   aeroway = {'no'},
+                                   amenity = {'no'},
+                                   club = {'no'},
+                                   craft = {'no'},
+                                   leisure = {'no'},
+                                   office = {'no'},
+                                   mountain_pass = {'no'},
+                                   shop = {'no'},
+                                   tourism = {'yes', 'no'},
+                                   bridge = {'no'},
+                                   tunnel = {'no'},
+                                   waterway = {'riverbank'},
+                                   building = {'no'},
+                                   boundary = {'place', 'land_area'}},
+                    extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
+                               '*:wikipedia', 'brand:wikipedia:*',
                                'addr:street:name', 'addr:street:type'}
-                      }
+                   }
 
-flex.NAMES = flex.tag_group{main = {'name', 'name:*',
+flex.set_name_tags{main = {'name', 'name:*',
                           'int_name', 'int_name:*',
                           'nat_name', 'nat_name:*',
                           'reg_name', 'reg_name:*',
@@ -101,17 +97,19 @@ flex.NAMES = flex.tag_group{main = {'name', 'name:*',
                    house = {'addr:housename'}
                   }
 
-flex.ADDRESS_TAGS = flex.tag_group{main = {'addr:housenumber',
-                                 'addr:conscriptionnumber',
-                                 'addr:streetnumber'},
-                         extra = {'addr:*', 'is_in:*', 'tiger:county'},
-                         postcode = {'postal_code', 'postcode', 'addr:postcode',
-                                     'tiger:zip_left', 'tiger:zip_right'},
-                         country = {'country_code', 'ISO3166-1',
-                                    'addr:country_code', 'is_in:country_code',
-                                    'addr:country', 'is_in:country'},
-                         interpolation = {'addr:interpolation'}
-                        }
+flex.set_address_tags{main = {'addr:housenumber',
+                              'addr:conscriptionnumber',
+                              'addr:streetnumber'},
+                      extra = {'addr:*', 'is_in:*', 'tiger:county'},
+                      postcode = {'postal_code', 'postcode', 'addr:postcode',
+                                  'tiger:zip_left', 'tiger:zip_right'},
+                      country = {'country_code', 'ISO3166-1',
+                                 'addr:country_code', 'is_in:country_code',
+                                 'addr:country', 'is_in:country'},
+                      interpolation = {'addr:interpolation'}
+                     }
+
 
-flex.SAVE_EXTRA_MAINS = true
+flex.set_unused_handling{delete_keys = {'tiger:*'}}
 
+return flex