Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-address.style b/settings/import-address.style
index 8390f8f06db490918692ef841bc6302721115344..8d622ec177025ef084ec8e77f4560eb8fdc3ed84 100644 (file)
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -32,7 +32,7 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",

-        "" : "fallback,with-name"
+        "" : "fallback,with_name"

     }
 },
 {
     }
 },
 {


@@ -60,21 +60,21 @@
     }
 },
 {
     }
 },
 {

-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:interpolation"],

     "values" : {
     "values" : {

-        "" : "address"
+        "" : "interpolation,address"

     }
 },
 {
     "keys" : ["postal_code", "postcode", "addr:postcode",
               "tiger:zip_left", "tiger:zip_right"],
     "values" : {
     }
 },
 {
     "keys" : ["postal_code", "postcode", "addr:postcode",
               "tiger:zip_left", "tiger:zip_right"],
     "values" : {

-        "" : "postcode"
+        "" : "postcode,fallback"

     }
 },
 {
     }
 },
 {

-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],

     "values" : {
         "" : "country"
     }
     "values" : {
         "" : "country"
     }