From 177b2df8d2c831fac67066493696e194aab98ce7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sun, 7 Apr 2019 11:26:58 -0700 Subject: [PATCH] Add Underwear Store preset and deprecate shop=underwear and shop=lingerie (close #6152) --- data/deprecated.json | 8 +++++ data/presets.yaml | 5 +++ data/presets/presets.json | 1 + .../presets/shop/clothes/underwear.json | 32 +++++++++++++++++++ data/taginfo.json | 3 ++ dist/locales/en.json | 4 +++ 6 files changed, 53 insertions(+) create mode 100644 data/presets/presets/shop/clothes/underwear.json diff --git a/data/deprecated.json b/data/deprecated.json index 47084b4df..4912519dc 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -487,6 +487,10 @@ "old": {"shop": "gallery"}, "replace": {"shop": "art"} }, + { + "old": {"shop": "lingerie"}, + "replace": {"shop": "clothes", "clothes": "underwear"} + }, { "old": {"shop": "moneylender"}, "replace": {"shop": "money_lender"} @@ -507,6 +511,10 @@ "old": {"shop": "tickets"}, "replace": {"shop": "ticket"} }, + { + "old": {"shop": "underwear"}, + "replace": {"shop": "clothes", "clothes": "underwear"} + }, { "old": {"shop": "winery"}, "replace": {"craft": "winery"} diff --git a/data/presets.yaml b/data/presets.yaml index 13a696f1f..5bc78c952 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6360,6 +6360,11 @@ en: name: Clothing Store # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: '' + shop/clothes/underwear: + # 'shop=clothes, clothes=underwear' + name: Underwear Store + # 'terms: boutique,bras,brassieres,briefs,boxers,clothes,fashion,lingerie,panties,slips,socks,stockings,underclothing,underpants' + terms: '' shop/coffee: # shop=coffee name: Coffee Store diff --git a/data/presets/presets.json b/data/presets/presets.json index bd99f6672..206e1c82e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -921,6 +921,7 @@ "shop/chemist": {"icon": "maki-grocery", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"}, "shop/chocolate": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"}, "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"}, + "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "clothes", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothing", "underpants"], "name": "Underwear Store"}, "shop/coffee": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, "shop/computer": {"icon": "maki-shop", "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"}, diff --git a/data/presets/presets/shop/clothes/underwear.json b/data/presets/presets/shop/clothes/underwear.json new file mode 100644 index 000000000..016ccb7aa --- /dev/null +++ b/data/presets/presets/shop/clothes/underwear.json @@ -0,0 +1,32 @@ +{ + "icon": "maki-clothing-store", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "clothes", + "clothes": "underwear" + }, + "reference": { + "key": "clothes", + "value": "underwear" + }, + "terms": [ + "boutique", + "bras", + "brassieres", + "briefs", + "boxers", + "clothes", + "fashion", + "lingerie", + "panties", + "slips", + "socks", + "stockings", + "underclothing", + "underpants" + ], + "name": "Underwear Store" +} diff --git a/data/taginfo.json b/data/taginfo.json index 3d316dbe7..b1e409fcf 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -863,6 +863,7 @@ {"key": "shop", "value": "chemist", "description": "🄿 Drugstore", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/grocery-15.svg?sanitize=true"}, {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "clothes", "description": "🄿 Clothing Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/clothing-store-15.svg?sanitize=true"}, + {"key": "clothes", "value": "underwear", "description": "🄿 Underwear Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/clothing-store-15.svg?sanitize=true"}, {"key": "shop", "value": "coffee", "description": "🄿 Coffee Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "computer", "description": "🄿 Computer Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "confectionery", "description": "🄿 Candy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionery-15.svg?sanitize=true"}, @@ -1764,11 +1765,13 @@ {"key": "shop", "value": "dive", "description": "🄳 ➜ shop=scuba_diving"}, {"key": "shop", "value": "fish", "description": "🄳 ➜ shop=seafood"}, {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"}, + {"key": "shop", "value": "lingerie", "description": "🄳 ➜ shop=clothes + clothes=underwear"}, {"key": "shop", "value": "moneylender", "description": "🄳 ➜ shop=money_lender"}, {"key": "shop", "value": "organic", "description": "🄳 ➜ shop=supermarket + organic=only"}, {"key": "shop", "value": "perfume", "description": "🄳 ➜ shop=perfumery"}, {"key": "shop", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, {"key": "shop", "value": "tickets", "description": "🄳 ➜ shop=ticket"}, + {"key": "shop", "value": "underwear", "description": "🄳 ➜ shop=clothes + clothes=underwear"}, {"key": "shop", "value": "winery", "description": "🄳 ➜ craft=winery"}, {"key": "sloped_curb", "value": "0", "description": "🄳 ➜ kerb=flush"}, {"key": "sloped_curb", "value": "0.00", "description": "🄳 ➜ kerb=flush"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 71ee644f6..3df414d58 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7729,6 +7729,10 @@ "name": "Clothing Store", "terms": "blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear" }, + "shop/clothes/underwear": { + "name": "Underwear Store", + "terms": "boutique,bras,brassieres,briefs,boxers,clothes,fashion,lingerie,panties,slips,socks,stockings,underclothing,underpants" + }, "shop/coffee": { "name": "Coffee Store", "terms": ""