fix merge issues

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

diff --git a/settings/import-full.lua b/settings/import-full.lua
index a932fa50e38dc263790e3378a543ed6ffdb11726..f8b1e7a73375f82cfbf37b168673b8a89cb63e8a 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',


@@ -24,17 +23,27 @@ flex.set_main_tags{
                secondary_link = 'named',
                tertiary_link = 'named'},
     railway = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},
     railway = 'named',

-    man_made = 'always',
+    man_made = {'none',
+                pier = 'always',
+                tower = 'always',
+                bridge = 'always',
+                works = 'named',
+                water_tower = 'always',
+                dyke = 'named',
+                lighthouse = 'always',
+                watermill = 'always',
+                tunnel = 'always'},

     aerialway = 'always',
     boundary = {'named',
     aerialway = 'always',
     boundary = {'named',

-                postal_code = 'named'},
+                postal_code = 'always'},

     aeroway = 'always',
     amenity = 'always',
     club = 'always',
     craft = 'always',
     junction = 'fallback',
     landuse = 'fallback',
     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',
     office = 'always',
     mountain_pass = 'always',
     shop = 'always',


@@ -50,18 +59,22 @@ 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',
                                    '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'},
                                    natural = {'yes', 'no', 'coastline'},
                                    highway = {'no', 'turning_circle', 'mini_roundabout',
                                               'noexit', 'crossing', 'give_way', 'stop'},
                     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'},
+                                   railway = {'level_crossing', 'no', 'rail', 'switch',
+                                              'abandoned', 'signal', 'buffer_stop', 'razed'},

                                    aerialway = {'pylon', 'no'},
                                    aeroway = {'no'},
                                    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'},


@@ -73,11 +86,8 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                    tunnel = {'no'},
                                    waterway = {'riverbank'},
                                    building = {'no'},
                                    tunnel = {'no'},
                                    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'}
+                                   boundary = {'place', 'land_area'}},
+                    extra_keys = {'wikidata', 'wikipedia', 'wikipedia:*'}

                    }
 
 flex.set_name_tags{main = {'name', 'name:*',
                    }
 
 flex.set_name_tags{main = {'name', 'name:*',