remove special case for operator names

The OSM data has been sufficiently cleaned up by now that
the operator no longer needs to be considered a name tag.
Use 'brand' as the searchable alternative.

diff --git a/settings/import-extratags.style b/settings/import-extratags.style
index 3416e8c49d66ef8b89cecd5dcce7eebb139b9e17..76146de2629f5adaaf153ec062ab01f3dcb41983 100644 (file)
--- a/settings/import-extratags.style
+++ b/settings/import-extratags.style
@@ -130,13 +130,6 @@
         "" : "main,with_name"
     }
 },
-{
-    "keys" : ["amenity"],
-    "values" : {
-        "restaurant" : "main,operator",
-        "fuel" : "main,operator"
-    }
-},
 {
     "keys" : ["aeroway", "amenity", "club", "craft", "leisure",
               "office", "mountain_pass"],
@@ -149,7 +142,7 @@
     "keys" : ["shop"],
     "values" : {
         "no" : "skip",
-        "" : "main,operator"
+        "" : "main"
     }
 },
 {
@@ -157,7 +150,7 @@
     "values" : {
         "yes" : "skip",
         "no" : "skip",
-        "" : "main,operator"
+        "" : "main"
     }
 },
 {

diff --git a/settings/import-full.style b/settings/import-full.style
index a74334cae902093017764adaa809f8a1d222254a..ed874a177ae3f5f4aaf59d572555bb190dead2a1 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -130,13 +130,6 @@
         "" : "main,with_name"
     }
 },
-{
-    "keys" : ["amenity"],
-    "values" : {
-        "restaurant" : "main,operator",
-        "fuel" : "main,operator"
-    }
-},
 {
     "keys" : ["aeroway", "amenity", "club", "craft", "leisure",
               "office", "mountain_pass"],
@@ -149,7 +142,7 @@
     "keys" : ["shop"],
     "values" : {
         "no" : "skip",
-        "" : "main,operator"
+        "" : "main"
     }
 },
 {
@@ -157,7 +150,7 @@
     "values" : {
         "yes" : "skip",
         "no" : "skip",
-        "" : "main,operator"
+        "" : "main"
     }
 },
 {