Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index 22c3d9c8392803192950fe5291387991efd7b747..830345c64e7d0749594a26a3db6fec22697f70de 100644 (file)
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -1,4 +1,4 @@
-flex = require('flex-base')
+local flex = require('flex-base')
 
 flex.set_main_tags{
     building = 'fallback',
@@ -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,14 +26,15 @@ flex.set_main_tags{
     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',
@@ -57,11 +57,12 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    natural = {'yes', 'no', 'coastline'},
                                    highway = {'no', 'turning_circle', 'mini_roundabout',
                                               'noexit', 'crossing', 'give_way', 'stop'},
-                                   railway = {'level_crossing', 'no', 'rail'},
+                                   railway = {'level_crossing', 'no', 'rail', 'switch',
+                                              'abandoned', 'signal', 'buffer_stop', 'razed'},
                                    man_made = {'survey_point', 'cutline'},
                                    aerialway = {'pylon', 'no'},
                                    aeroway = {'no'},
-                                   amenity = {'no'},
+                                   amenity = {'no', 'parking_space', 'parking_entrance'},
                                    club = {'no'},
                                    craft = {'no'},
                                    leisure = {'no'},
@@ -73,10 +74,11 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},
-                                   boundary = {'place'}},
-                    extratag_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
+                                   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'}
                    }
 
@@ -110,3 +112,5 @@ flex.set_address_tags{main = {'addr:housenumber',
 
 
 flex.set_unused_handling{delete_keys = {'tiger:*'}}
+
+return flex