remove warning about now removed legacy tokenizer

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

diff --git a/settings/import-full.lua b/settings/import-full.lua
index 1dc317a9bc0f5e1b4c9bcbd3d1ee4e1a6996f449..11bd1f3a7f98a524eac06884e8b8e96c66a41a93 100644 (file)
--- a/settings/import-full.lua
+++ b/settings/import-full.lua
@@ -23,7 +23,17 @@ 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',
+                adit = 'named',
+                lighthouse = 'always',
+                watermill = 'always',
+                tunnel = 'always'},

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


@@ -33,7 +43,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',


@@ -60,11 +71,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'},
-                                   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',
+                                              'waste_disposal', 'hunting_stand'},

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


@@ -76,7 +88,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:*'}
                    }