fix merge issues

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

diff --git a/settings/import-full.lua b/settings/import-full.lua
index 5b1ab060f1cbb437631472d92e278daddbc4ac80..f8b1e7a73375f82cfbf37b168673b8a89cb63e8a 100644 (file)
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -23,7 +23,16 @@ flex.set_main_tags{
                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',
                 postal_code = 'always'},
@@ -63,7 +72,6 @@ flex.set_prefilters{delete_keys = {'note', 'note:*', 'source', '*source', 'attri
                                               'noexit', 'crossing', 'give_way', 'stop'},
                                    railway = {'level_crossing', 'no', 'rail', 'switch',
                                               'abandoned', 'signal', 'buffer_stop', 'razed'},
-                                   man_made = {'survey_point', 'cutline'},
                                    aerialway = {'pylon', 'no'},
                                    aeroway = {'no'},
                                    amenity = {'no', 'parking_space', 'parking_entrance'},