From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 28 Feb 2024 13:22:08 +0000 (+0100)
Subject: Merge pull request #3347 from lonvia/tweak-boundary-imports
X-Git-Tag: v4.4.0~7
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9a84adef5981d1a8357fd1775358742aae83867b?hp=1879cf902c8271b8f5e15a8272adebe3c0d10193

Merge pull request #3347 from lonvia/tweak-boundary-imports

Assorted style tweaks
---

diff --git a/settings/import-extratags.lua b/settings/import-extratags.lua
index 204bd1c8..830345c6 100644
--- a/settings/import-extratags.lua
+++ b/settings/import-extratags.lua
@@ -33,7 +33,8 @@ flex.set_main_tags{
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',
-    leisure = 'always',
+    leisure = {'always',
+               nature_reserve = 'fallback'},
     office = 'always',
     mountain_pass = 'always',
     shop = 'always',
@@ -56,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'},
@@ -72,7 +74,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},
-                                   boundary = {'place'}},
+                                   boundary = {'place', 'land_area'}},
                     extra_keys = {'*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                'name:etymology', 'name:signed', 'name:botanical',
                                'wikidata', '*:wikidata',
diff --git a/settings/import-full.lua b/settings/import-full.lua
index 1dc317a9..5b1ab060 100644
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -33,7 +33,8 @@ flex.set_main_tags{
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',
-    leisure = 'always',
+    leisure = {'always',
+               nature_reserve = 'fallback'},
     office = 'always',
     mountain_pass = 'always',
     shop = 'always',
@@ -60,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'},
-                                   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'},
@@ -76,7 +78,7 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},
-                                   boundary = {'place'}},
+                                   boundary = {'place', 'land_area'}},
                     extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}
                    }