From b441bd50ab974966f7550d88cf8360ca1b14c9bf Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 17 Jun 2020 17:21:48 -0400 Subject: [PATCH] Update name, terms, icon, and ID of organic supermarket preset (close #7714) Add Organic Products field --- data/presets.yaml | 21 +++++++++++++++---- data/presets/fields.json | 1 + data/presets/fields/organic.json | 16 ++++++++++++++ data/presets/presets.json | 10 ++++----- data/presets/presets/shop/convenience.json | 4 ++++ data/presets/presets/shop/farm.json | 4 ++++ data/presets/presets/shop/greengrocer.json | 4 ++++ data/presets/presets/shop/organic.json | 12 ----------- data/presets/presets/shop/supermarket.json | 3 ++- .../presets/shop/supermarket/organic.json | 18 ++++++++++++++++ data/taginfo.json | 4 +++- dist/locales/en.json | 17 +++++++++++---- 12 files changed, 87 insertions(+), 27 deletions(-) create mode 100644 data/presets/fields/organic.json delete mode 100644 data/presets/presets/shop/organic.json create mode 100644 data/presets/presets/shop/supermarket/organic.json diff --git a/data/presets.yaml b/data/presets.yaml index 01c733c8c..f12378c1f 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1648,6 +1648,18 @@ en: operator/type: # 'operator:type=*' label: Operator Type + organic: + # organic=* + label: Organic Products + options: + # organic=no + 'no': None + # organic=only + only: Only + # organic=yes + 'yes': Some + # 'terms: natural,non-gmo' + terms: '[translate with synonyms or related terms for ''Organic Products'', separated by commas]' outdoor_seating: # outdoor_seating=* label: Outdoor Seating @@ -8217,10 +8229,6 @@ en: name: Optician # 'terms: eye,glasses' terms: '' - shop/organic: - # 'shop=supermarket, organic=only' - name: Organic Goods Store - terms: '' shop/outdoor: # shop=outdoor name: Outdoors Store @@ -8357,6 +8365,11 @@ en: name: Supermarket # 'terms: grocery,store,shop' terms: '' + shop/supermarket/organic: + # 'shop=supermarket, organic=only' + name: Organic Supermarket + # 'terms: natural foods' + terms: '' shop/swimming_pool: # shop=swimming_pool name: Pool Supply Store diff --git a/data/presets/fields.json b/data/presets/fields.json index d8c8802fd..b29782eba 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -299,6 +299,7 @@ "opening_hours/covid19": {"key": "opening_hours:covid19", "type": "combo", "label": "COVID-19 Pandemic Hours", "terms": ["coronavirus", "lockdown", "opening hours", "SARS‑CoV‑2"], "snake_case": false}, "operator": {"key": "operator", "type": "text", "label": "Operator"}, "operator/type": {"key": "operator:type", "type": "combo", "label": "Operator Type", "prerequisiteTag": {"key": "operator"}}, + "organic": {"key": "organic", "type": "combo", "label": "Organic Products", "strings": {"options": {"no": "None", "yes": "Some", "only": "Only"}}, "terms": ["natural", "non-gmo"]}, "outdoor_seating": {"key": "outdoor_seating", "type": "check", "label": "Outdoor Seating"}, "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."}, "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"}, diff --git a/data/presets/fields/organic.json b/data/presets/fields/organic.json new file mode 100644 index 000000000..aede47d25 --- /dev/null +++ b/data/presets/fields/organic.json @@ -0,0 +1,16 @@ +{ + "key": "organic", + "type": "combo", + "label": "Organic Products", + "strings": { + "options": { + "no": "None", + "yes": "Some", + "only": "Only" + } + }, + "terms": [ + "natural", + "non-gmo" + ] +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 85c0e1fae..24f4c50d0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1093,7 +1093,7 @@ "shop/collector": {"icon": "fas-th", "fields": ["name", "collector", "{shop}"], "geometry": ["point", "area"], "terms": ["antiques", "coins", "collection", "collectors", "comics", "dolls", "figurines", "numismatics", "philately", "stamps", "thrift"], "tags": {"shop": "collector"}, "name": "Collectibles Shop"}, "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "laptop", "hardware", "operating system", "software"], "name": "Computer Store"}, "shop/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"}, - "shop/convenience": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"}, + "shop/convenience": {"icon": "fas-shopping-basket", "moreFields": ["{shop}", "organic"], "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"}, "shop/copyshop": {"icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "terms": ["print", "scan"], "name": "Copy Store"}, "shop/cosmetics": {"icon": "temaki-lipstick", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"}, "shop/country_store": {"icon": "fas-hat-cowboy-side", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"}, @@ -1111,7 +1111,7 @@ "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"}, "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"}, "shop/fabric": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"}, - "shop/farm": {"icon": "fas-apple-alt", "geometry": ["point", "area"], "terms": ["baked goods", "farm shop", "farm stand", "fresh food", "fruits", "greengrocer", "organics", "vegetables"], "tags": {"shop": "farm"}, "name": "Produce Stand"}, + "shop/farm": {"icon": "fas-apple-alt", "fields": ["{shop}", "organic"], "geometry": ["point", "area"], "terms": ["baked goods", "farm shop", "farm stand", "fresh food", "fruits", "greengrocer", "organics", "vegetables"], "tags": {"shop": "farm"}, "name": "Produce Stand"}, "shop/fashion_accessories": {"icon": "temaki-fashion_accessories", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"}, "shop/fireplace": {"icon": "temaki-fireplace", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"}, "shop/fishing": {"icon": "temaki-ice_fishing", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"}, @@ -1127,7 +1127,7 @@ "shop/gas": {"icon": "temaki-propane_tank", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"}, "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["village shop"], "name": "General Store"}, "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"}, - "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"}, + "shop/greengrocer": {"icon": "fas-carrot", "fields": ["{shop}", "organic"], "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"}, "shop/hairdresser_supply": {"icon": "temaki-hair_care", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"}, "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"}, "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"}, @@ -1162,7 +1162,6 @@ "shop/newsagent": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"}, "shop/nutrition_supplements": {"icon": "fas-pills", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"}, "shop/optician": {"icon": "maki-optician", "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"}, - "shop/organic": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"}, "shop/outdoor": {"icon": "temaki-compass", "fields": ["{shop}", "clothes"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"}, "shop/outpost": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["online", "pick up", "pickup"], "tags": {"shop": "outpost"}, "name": "Online Retailer Outpost"}, "shop/paint": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"}, @@ -1190,7 +1189,8 @@ "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"], "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"], "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"}, "shop/tattoo": {"icon": "temaki-tattoo_machine", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"}, diff --git a/data/presets/presets/shop/convenience.json b/data/presets/presets/shop/convenience.json index efe798207..bb77986b1 100644 --- a/data/presets/presets/shop/convenience.json +++ b/data/presets/presets/shop/convenience.json @@ -1,5 +1,9 @@ { "icon": "fas-shopping-basket", + "moreFields": [ + "{shop}", + "organic" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json index 8e64a36b8..30053bb77 100644 --- a/data/presets/presets/shop/farm.json +++ b/data/presets/presets/shop/farm.json @@ -1,5 +1,9 @@ { "icon": "fas-apple-alt", + "fields": [ + "{shop}", + "organic" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/greengrocer.json b/data/presets/presets/shop/greengrocer.json index 50815f8bb..adcc27c66 100644 --- a/data/presets/presets/shop/greengrocer.json +++ b/data/presets/presets/shop/greengrocer.json @@ -1,5 +1,9 @@ { "icon": "fas-carrot", + "fields": [ + "{shop}", + "organic" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/organic.json b/data/presets/presets/shop/organic.json deleted file mode 100644 index 5a5411a7f..000000000 --- a/data/presets/presets/shop/organic.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "icon": "maki-shop", - "geometry": [ - "point", - "area" - ], - "tags": { - "shop": "supermarket", - "organic": "only" - }, - "name": "Organic Goods Store" -} diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json index 506f763d7..cb85e1cb3 100644 --- a/data/presets/presets/shop/supermarket.json +++ b/data/presets/presets/shop/supermarket.json @@ -2,7 +2,8 @@ "icon": "maki-grocery", "moreFields": [ "{shop}", - "diet_multi" + "diet_multi", + "organic" ], "geometry": [ "point", diff --git a/data/presets/presets/shop/supermarket/organic.json b/data/presets/presets/shop/supermarket/organic.json new file mode 100644 index 000000000..2cfa71f01 --- /dev/null +++ b/data/presets/presets/shop/supermarket/organic.json @@ -0,0 +1,18 @@ +{ + "icon": "maki-grocery", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "supermarket", + "organic": "only" + }, + "reference": { + "key": "organic" + }, + "terms": [ + "natural foods" + ], + "name": "Organic Supermarket" +} diff --git a/data/taginfo.json b/data/taginfo.json index e5b5b932a..75bff7e53 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1107,7 +1107,6 @@ {"key": "shop", "value": "newsagent", "description": "πŸ„Ώ Newspaper/Magazine Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-newspaper.svg"}, {"key": "shop", "value": "nutrition_supplements", "description": "πŸ„Ώ Nutrition Supplements Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-pills.svg"}, {"key": "shop", "value": "optician", "description": "πŸ„Ώ Optician", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/optician-15.svg"}, - {"key": "organic", "value": "only", "description": "πŸ„Ώ Organic Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "outdoor", "description": "πŸ„Ώ Outdoors Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/compass.svg"}, {"key": "shop", "value": "outpost", "description": "πŸ„Ώ Online Retailer Outpost", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "paint", "description": "πŸ„Ώ Paint Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-paint-roller.svg"}, @@ -1136,6 +1135,7 @@ {"key": "shop", "value": "stationery", "description": "πŸ„Ώ Stationery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-paperclip.svg"}, {"key": "shop", "value": "storage_rental", "description": "πŸ„Ώ Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_rental.svg"}, {"key": "shop", "value": "supermarket", "description": "πŸ„Ώ Supermarket", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/grocery-15.svg"}, + {"key": "organic", "value": "only", "description": "πŸ„Ώ Organic Supermarket, πŸ„΅ Organic Products", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/grocery-15.svg"}, {"key": "shop", "value": "swimming_pool", "description": "πŸ„Ώ Pool Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-swimmer.svg"}, {"key": "shop", "value": "tailor", "description": "πŸ„Ώ Tailor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/needle_and_spool.svg"}, {"key": "shop", "value": "tattoo", "description": "πŸ„Ώ Tattoo Parlor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tattoo_machine.svg"}, @@ -1692,6 +1692,8 @@ {"key": "opening_hours:covid19", "description": "πŸ„΅ COVID-19 Pandemic Hours"}, {"key": "operator", "description": "πŸ„΅ Operator"}, {"key": "operator:type", "description": "πŸ„΅ Operator Type"}, + {"key": "organic", "value": "no", "description": "πŸ„΅ Organic Products"}, + {"key": "organic", "value": "yes", "description": "πŸ„΅ Organic Products"}, {"key": "outdoor_seating", "description": "πŸ„΅ Outdoor Seating"}, {"key": "par", "description": "πŸ„΅ Par"}, {"key": "park_ride", "description": "πŸ„΅ Park and Ride"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 37c4cc531..1135b1b59 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4111,6 +4111,15 @@ "operator/type": { "label": "Operator Type" }, + "organic": { + "label": "Organic Products", + "terms": "natural,non-gmo", + "options": { + "no": "None", + "yes": "Some", + "only": "Only" + } + }, "outdoor_seating": { "label": "Outdoor Seating", "terms": "" @@ -9681,10 +9690,6 @@ "name": "Optician", "terms": "eye,glasses" }, - "shop/organic": { - "name": "Organic Goods Store", - "terms": "" - }, "shop/outdoor": { "name": "Outdoors Store", "terms": "camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies" @@ -9797,6 +9802,10 @@ "name": "Supermarket", "terms": "grocery,store,shop" }, + "shop/supermarket/organic": { + "name": "Organic Supermarket", + "terms": "natural foods" + }, "shop/swimming_pool": { "name": "Pool Supply Store", "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"