From f3f6f152b8486095e244e54290d55729b24da022 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 11 Nov 2019 11:29:49 +0100
Subject: [PATCH] Adjust name, add terms, and add derived data for
 `shop=spices` preset (re: #7031)

---
 data/presets.yaml                     | 5 +++++
 data/presets/presets.json             | 1 +
 data/presets/presets/shop/spices.json | 4 +++-
 data/taginfo.json                     | 1 +
 dist/locales/en.json                  | 4 ++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 8859f7911..04d11c519 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7756,6 +7756,11 @@ en:
         name: Shoe Store
         # 'terms: boots,cleats,clogs,heels,loafers,oxfords,sneakers'
         terms: '<translate with synonyms or related terms for ''Shoe Store'', separated by commas>'
+      shop/spices:
+        # shop=spices
+        name: Spice Shop
+        # 'terms: chili,cinnamon,curry,ginger,herbs,pepper,saffron,salt,spice store,spices,turmeric,wasabi'
+        terms: '<translate with synonyms or related terms for ''Spice Shop'', separated by commas>'
       shop/sports:
         # shop=sports
         name: Sporting Goods Store
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 11ff0e395..2cf145209 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1130,6 +1130,7 @@
     "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
     "shop/sewing": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
     "shop/shoes": {"icon": "maki-shoe", "geometry": ["point", "area"], "tags": {"shop": "shoes"}, "terms": ["boots", "cleats", "clogs", "heels", "loafers", "oxfords", "sneakers"], "name": "Shoe Store"},
+    "shop/spices": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["chili", "cinnamon", "curry", "ginger", "herbs", "pepper", "saffron", "salt", "spice store", "spices", "turmeric", "wasabi"], "tags": {"shop": "spices"}, "name": "Spice Shop"},
     "shop/sports": {"icon": "fas-futbol", "fields": ["name", "operator", "sport", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "terms": ["athletics"], "name": "Sporting Goods Store"},
     "shop/stationery": {"icon": "fas-paperclip", "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
     "shop/storage_rental": {"icon": "fas-warehouse", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["garages"], "name": "Storage Rental"},
diff --git a/data/presets/presets/shop/spices.json b/data/presets/presets/shop/spices.json
index 38fcfeb4d..6b8c9d7b5 100644
--- a/data/presets/presets/shop/spices.json
+++ b/data/presets/presets/shop/spices.json
@@ -13,11 +13,13 @@
         "pepper",
         "saffron",
         "salt",
+        "spice store",
+        "spices",
         "turmeric",
         "wasabi"
     ],
     "tags": {
         "shop": "spices"
     },
-    "name": "Spice Store"
+    "name": "Spice Shop"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 888537099..652760263 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1073,6 +1073,7 @@
     {"key": "shop", "value": "second_hand", "description": "🄿 Consignment/Thrift Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "sewing", "description": "🄿 Sewing Supply Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "shoes", "description": "🄿 Shoe Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shoe-15.svg"},
+    {"key": "shop", "value": "spices", "description": "🄿 Spice Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "sports", "description": "🄿 Sporting Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-futbol.svg"},
     {"key": "shop", "value": "stationery", "description": "🄿 Stationery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-paperclip.svg"},
     {"key": "shop", "value": "storage_rental", "description": "🄿 Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 42e91f974..d1d2e90b7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9093,6 +9093,10 @@
                     "name": "Shoe Store",
                     "terms": "boots,cleats,clogs,heels,loafers,oxfords,sneakers"
                 },
+                "shop/spices": {
+                    "name": "Spice Shop",
+                    "terms": "chili,cinnamon,curry,ginger,herbs,pepper,saffron,salt,spice store,spices,turmeric,wasabi"
+                },
                 "shop/sports": {
                     "name": "Sporting Goods Store",
                     "terms": "athletics"