Revert brand-related preset changes

I'm not convinced we shouldn't be encouraging simply tagging
`name=McDonald's`, `name=Shell`, etc., without `brand` or
`operator` at all.

data/presets.yaml

@@ -118,15 +118,6 @@ en:
         label: Type
       boundary:
         label: Type
-      brand_fast_food:
-        label: Brand
-        placeholder: "McDonald's, Subway, KFC..."
-      brand_fuel:
-        label: Brand
-        placeholder: "Shell, Exxon, BP..."
-      brand_restaurant:
-        label: Brand
-        placeholder: "Olive Garden, Applebee's, TGI Friday's..."
       building:
         label: Building
       building_area:

data/presets/fields.json

@@ -212,24 +212,6 @@
         "type": "combo",
         "label": "Type"
     },
-    "brand_fast_food": {
-        "key": "brand",
-        "type": "text",
-        "placeholder": "McDonald's, Subway, KFC...",
-        "label": "Brand"
-    },
-    "brand_fuel": {
-        "key": "brand",
-        "type": "text",
-        "placeholder": "Shell, Exxon, BP...",
-        "label": "Brand"
-    },
-    "brand_restaurant": {
-        "key": "brand",
-        "type": "text",
-        "placeholder": "Olive Garden, Applebee's, TGI Friday's...",
-        "label": "Brand"
-    },
     "building": {
         "key": "building",
         "type": "typeCombo",

data/presets/fields/brand_fast_food.json

@@ -1,6 +0,0 @@
-{
-    "key": "brand",
-    "type": "text",
-    "placeholder": "McDonald's, Subway, KFC...",
-    "label": "Brand"
-}

data/presets/fields/brand_fuel.json

@@ -1,6 +0,0 @@
-{
-    "key": "brand",
-    "type": "text",
-    "placeholder": "Shell, Exxon, BP...",
-    "label": "Brand"
-}

data/presets/fields/brand_restaurant.json

@@ -1,6 +0,0 @@
-{
-    "key": "brand",
-    "type": "text",
-    "placeholder": "Olive Garden, Applebee's, TGI Friday's...",
-    "label": "Brand"
-}

data/presets/presets/amenity/fast_food.json

@@ -1,7 +1,6 @@
 {
     "icon": "fast-food",
     "fields": [
-        "brand_fast_food",
         "cuisine",
         "building_area",
         "address",
@@ -16,22 +15,6 @@
     "tags": {
         "amenity": "fast_food"
     },
-    "terms": [
-        "breakfast",
-        "cafe*",
-        "café",
-        "coffee",
-        "dine*",
-        "dining",
-        "dinner",
-        "drive-in",
-        "eat*",
-        "grill",
-        "hamburger",
-        "lunch",
-        "pizza",
-        "sandwich",
-        "take*"
-    ],
+    "terms": [],
     "name": "Fast Food"
 }

data/presets/presets/amenity/fuel.json

@@ -1,10 +1,9 @@
 {
     "icon": "fuel",
     "fields": [
-        "brand_fuel",
+        "operator",
         "address",
-        "building_area",
-        "operator"
+        "building_area"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/restaurant.json

@@ -1,7 +1,6 @@
 {
     "icon": "restaurant",
     "fields": [
-        "brand_restaurant",
         "cuisine",
         "building_area",
         "address",
@@ -15,21 +14,38 @@
         "area"
     ],
     "terms": [
-        "breakfast",
-        "cafe*",
+        "bar",
+        "cafeteria",
         "café",
-        "coffee",
-        "dine*",
-        "dining",
-        "dinner",
+        "canteen",
+        "chophouse",
+        "coffee shop",
+        "diner",
+        "dining room",
+        "dive*",
+        "doughtnut shop",
         "drive-in",
-        "eat*",
+        "eatery",
+        "eating house",
+        "eating place",
+        "fast-food place",
+        "fish and chips",
+        "greasy spoon",
         "grill",
-        "hamburger",
-        "lunch",
-        "pizza",
-        "sandwich",
-        "take*"
+        "hamburger stand",
+        "hashery",
+        "hideaway",
+        "hotdog stand",
+        "inn",
+        "joint*",
+        "luncheonette",
+        "lunchroom",
+        "night club",
+        "outlet*",
+        "pizzeria",
+        "saloon",
+        "soda fountain",
+        "watering hole"
     ],
     "tags": {
         "amenity": "restaurant"