flex: switch to functions for substyles

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

diff --git a/settings/import-admin.style b/settings/import-admin.style
index 89a1eb1688937c48250f7af5ff523f8b362187aa..37d03a83d8cc8795be2ef20174df89a35d073efc 100644 (file)
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -1,13 +1,20 @@
 [
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
+    "values" : {
+        "" : "extra"
+    }
+},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
+    "keys" : ["*:prefix", "*:suffix", "name:prefix:*", "name:suffix:*",
+              "name:etymology", "name:signed", "name:botanical", "*:wikidata",
+              "addr:street:name", "addr:street:type"],
     "values" : {
         "" : "skip"
     }
 },
 {
     "keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
-              "iata", "icao", "pcode"],
+              "iata", "icao", "pcode", "ISO3166-2"],
     "values" : {
         "" : "ref"
     }
@@ -26,7 +33,7 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
-        "" : "fallback"
+        "" : "fallback,with_name"
     }
 },
 {
@@ -42,23 +49,29 @@
     }
 },
 {
-    "keys" : ["postal_code", "postcode", "addr:postcode",
-              "tiger:zip_left", "tiger:zip_right"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
-        "" : "postcode"
+        "" : "country"
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
-        "" : "country"
+        "" : "address"
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county"],
+    "keys" : ["postal_code", "postcode", "addr:postcode",
+              "tiger:zip_left", "tiger:zip_right"],
     "values" : {
-        "" : "address"
+        "" : "postcode"
+    }
+},
+{
+    "keys" : ["capital"],
+    "values" : {
+        "" : "extra"
     }
 }
 ]