remove last traces of website customization

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

diff --git a/settings/import-street.lua b/settings/import-street.lua
index acadf01e7769c8229cba9dfff09c0f95c2755e56..60b76dfb3d1fa296e94f455555105e6aa302697e 100644 (file)
--- a/settings/import-street.lua
+++ b/settings/import-street.lua
@@ -1,9 +1,16 @@
 local flex = require('flex-base')
 
 flex.set_main_tags{
 local flex = require('flex-base')
 
 flex.set_main_tags{

-    highway = {'always',
-               street_lamp = 'named',
-               traffic_signals = 'named',
+    highway = {motorway = 'always',
+               trunk = 'always',
+               primary = 'always',
+               secondary = 'always',
+               tertiary = 'always',
+               unclassified = 'always',
+               residential = 'always',
+               road = 'always',
+               living_street = 'always',
+               pedestrian = 'always',

                service = 'named',
                cycleway = 'named',
                path = 'named',
                service = 'named',
                cycleway = 'named',
                path = 'named',


@@ -16,7 +23,8 @@ flex.set_main_tags{
                primary_link = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},
                primary_link = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},

-    boundary = {administrative = 'named'},
+    boundary = {administrative = 'named',
+                postal_code = 'always'},

     landuse = 'fallback',
     place = 'always'
 }
     landuse = 'fallback',
     place = 'always'
 }


@@ -24,13 +32,11 @@ flex.set_main_tags{
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'addr:housenumber', 'addr:street',
                                    'source', '*source', 'type',
 flex.set_prefilters{delete_keys = {'building', 'source',
                                    'addr:housenumber', 'addr:street',
                                    'source', '*source', 'type',

-                                   'is_in:postcode', '*:wikidata',
+                                   'is_in:postcode', '*:wikidata', '*:wikipedia',

                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},
                                    '*:prefix', '*:suffix', 'name:prefix:*', 'name:suffix:*',
                                    'name:etymology', 'name:signed', 'name:botanical',
                                    'addr:street:name', 'addr:street:type'},

-                    delete_tags = {highway = {'no', 'turning_circle', 'mini_roundabout',
-                                              'noexit', 'crossing', 'give_way', 'stop'},
-                                   landuse = {'cemetry', 'no'},
+                    delete_tags = {landuse = {'cemetry', 'no'},

                                    boundary = {'place'}},
                     extra_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital', 'area'}
                    }
                                    boundary = {'place'}},
                     extra_keys = {'wikipedia', 'wikipedia:*', 'wikidata', 'capital', 'area'}
                    }


@@ -44,7 +50,7 @@ flex.set_name_tags{main = {'name', 'name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',
                           'alt_name', 'alt_name:*', 'alt_name_*',
                           'official_name', 'official_name:*',
                           'place_name', 'place_name:*',

-                          'short_name', 'short_name:*', 'brand'},
+                          'short_name', 'short_name:*'},

                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}
                    extra = {'ref', 'int_ref', 'nat_ref', 'reg_ref',
                             'loc_ref', 'old_ref',
                             'iata', 'icao', 'pcode', 'pcode:*', 'ISO3166-2'}