Merge pull request #3411 from lonvia/fix-address-style

Address and street style: switch to explicit choice of highway values

diff --git a/settings/import-address.lua b/settings/import-address.lua
index 43248b02efb5a9f0c48b1c6508f144fdcf10cce5..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{
-    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',
@@ -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'},
-                    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'}
                    }

diff --git a/settings/import-street.lua b/settings/import-street.lua
index 68ad48bdf89305619612ffb629f1310ac3a89c6e..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{
-    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',
@@ -29,9 +36,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'},
-                    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'}
                    }