Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-admin.style b/settings/import-admin.style
index 02e43fb21483945bc6bad99f64bb788976c4a1b0..058d83a9147eae791369b97aedc48ad1a15be3d5 100644 (file)
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -1,6 +1,12 @@
 [
 [

+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
+    "values" : {
+        "" : "extra"
+    }
+},

 {
 {

-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
+              "name:botanical", "*wikidata"],

     "values" : {
         "" : "skip"
     }
     "values" : {
         "" : "skip"
     }


@@ -43,7 +49,7 @@
 },
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
 },
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",

-              "addr:country", "addr:country", "addr:country_code"],
+              "addr:country", "addr:country_code"],

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