translate UsageError in CLI API commands

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

diff --git a/settings/import-address.lua b/settings/import-address.lua
index 46ab3421352b38d8e8718c850fe26856131963d7..b177b73ca234994bbd1bc51dcf9b1a7ddb4a6b2e 100644 (file)
--- a/settings/import-address.lua
+++ b/settings/import-address.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',


@@ -17,7 +24,7 @@ flex.set_main_tags{
                secondary_link = 'named',
                tertiary_link = 'named'},
     boundary = {administrative = 'named',
                secondary_link = 'named',
                tertiary_link = 'named'},
     boundary = {administrative = 'named',

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

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


@@ -28,9 +35,7 @@ flex.set_prefilters{delete_keys = {'building', 'source',
                                    '*: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'}
                    }