Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-full.lua b/settings/import-full.lua
index 1b64124dfcb4aa85411a35a6e293f4b166f3771a..5b1ab060f1cbb437631472d92e278daddbc4ac80 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',
     historic = 'always',
     military = 'always',
     natural = 'named',

-    landuse = 'named',

     highway = {'always',
                street_lamp = 'named',
                traffic_signals = 'named',
     highway = {'always',
                street_lamp = 'named',
                traffic_signals = 'named',


@@ -34,7 +33,8 @@ flex.set_main_tags{
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',

-    leisure = 'always',
+    leisure = {'always',
+               nature_reserve = 'fallback'},

     office = 'always',
     mountain_pass = 'always',
     shop = 'always',
     office = 'always',
     mountain_pass = 'always',
     shop = 'always',


@@ -61,11 +61,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'},
                                    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'},
                                    man_made = {'survey_point', 'cutline'},
                                    aerialway = {'pylon', 'no'},
                                    aeroway = {'no'},

-                                   amenity = {'no'},
+                                   amenity = {'no', 'parking_space', 'parking_entrance'},

                                    club = {'no'},
                                    craft = {'no'},
                                    leisure = {'no'},
                                    club = {'no'},
                                    craft = {'no'},
                                    leisure = {'no'},


@@ -77,7 +78,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},

-                                   boundary = {'place'}},
+                                   boundary = {'place', 'land_area'}},

                     extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}
                    }
 
                     extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}
                    }