From 23c759fa987f18b6f6b630bd064d87ad5fde7486 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Mon, 14 Sep 2020 10:13:55 -0400 Subject: [PATCH] Fix syntax error and add derived data for #7986 and #7987 --- data/presets.yaml | 4 ++-- data/presets/presets.json | 4 ++-- data/presets/presets/shop/supermarket.json | 5 ++--- dist/locales/en.json | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 5411aa075..328930e83 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3198,7 +3198,7 @@ en: amenity/cafe/bubble_tea: # 'amenity=cafe, cuisine=bubble_tea' name: Bubble Tea Cafe - # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca' + # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca,pearl tea,boba drink' terms: '' amenity/cafe/coffee_shop: # 'amenity=cafe, cuisine=coffee_shop' @@ -8484,7 +8484,7 @@ en: shop/supermarket: # shop=supermarket name: Supermarket - # 'terms: grocery,store,shop' + # 'terms: grocery,store,shop,grocery store,market,food market' terms: '' shop/supermarket/organic: # 'shop=supermarket, organic=only' diff --git a/data/presets/presets.json b/data/presets/presets.json index a77b48ca1..0d05f8509 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -82,7 +82,7 @@ "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["access_simple", "address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"}, "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"}, "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"}, - "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca"], "name": "Bubble Tea Cafe"}, + "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca", "pearl tea", "boba drink"], "name": "Bubble Tea Cafe"}, "amenity/cafe/coffee_shop": {"icon": "temaki-hot_drink_cup", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "coffee_shop"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": ["americano", "brew", "cafe", "café", "caffe", "caffè", "cappuccino", "cocoa", "coffee shop", "drip", "espresso", "hot drinks", "latte", "macchiato", "tea"], "name": "Coffeehouse"}, "amenity/car_pooling": {"icon": "temaki-car_pool", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "opening_hours/covid19", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "terms": ["car sharing", "carpooling", "lift sharing", "ride sharing"], "name": "Car Pooling Station"}, "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"}, @@ -1201,7 +1201,7 @@ "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": "temaki-storage_rental", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["device storage", "garages", "self storage", "self-service storage", "storage lockers", "storage rental", "storage units"], "name": "Storage Rental"}, - "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"}, + "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop", "grocery store", "market", "food market"], "tags": {"shop": "supermarket"}, "name": "Supermarket"}, "shop/supermarket/organic": {"icon": "maki-grocery", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "reference": {"key": "organic"}, "terms": ["natural foods"], "name": "Organic Supermarket"}, "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"}, "shop/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"}, diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json index 542aad475..8d42dbfc8 100644 --- a/data/presets/presets/shop/supermarket.json +++ b/data/presets/presets/shop/supermarket.json @@ -13,10 +13,9 @@ "grocery", "store", "shop", - "grocery store" - "market" + "grocery store", + "market", "food market" - ], "tags": { "shop": "supermarket" diff --git a/dist/locales/en.json b/dist/locales/en.json index c60fc07dc..9cb966c86 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5533,7 +5533,7 @@ }, "amenity/cafe/bubble_tea": { "name": "Bubble Tea Cafe", - "terms": "boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca" + "terms": "boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca,pearl tea,boba drink" }, "amenity/cafe/coffee_shop": { "name": "Coffeehouse", @@ -9960,7 +9960,7 @@ }, "shop/supermarket": { "name": "Supermarket", - "terms": "grocery,store,shop" + "terms": "grocery,store,shop,grocery store,market,food market" }, "shop/supermarket/organic": { "name": "Organic Supermarket",