From d76baa9b8365f656c0996313fe13149d2fce2077 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 27 Mar 2019 09:53:26 -0400 Subject: [PATCH] Deprecated shop=fashion and shop=boutique (close #6109) Add clothing-related search terms to Clothing Shop preset --- data/deprecated.json | 12 ++++++++++-- data/presets.yaml | 3 +-- data/presets/presets.json | 6 +++--- .../shop/{boutique.json => _boutique.json} | 1 + .../shop/{fashion.json => _fashion.json} | 1 + data/presets/presets/shop/clothes.json | 16 ++++++++++++++++ data/taginfo.json | 6 +++--- dist/locales/en.json | 18 +++++++++--------- 8 files changed, 44 insertions(+), 19 deletions(-) rename data/presets/presets/shop/{boutique.json => _boutique.json} (90%) rename data/presets/presets/shop/{fashion.json => _fashion.json} (90%) diff --git a/data/deprecated.json b/data/deprecated.json index 3d2cfdfd7..40c5d811d 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -332,8 +332,12 @@ "replace": {"shop": "bookmaker"} }, { - "old": {"shop": "organic"}, - "replace": {"shop": "supermarket", "organic": "only"} + "old": {"shop": "boutique"}, + "replace": {"shop": "clothes"} + }, + { + "old": {"shop": "fashion"}, + "replace": {"shop": "clothes"} }, { "old": {"shop": "fish"}, @@ -351,6 +355,10 @@ "old": {"shop": "gallery"}, "replace": {"shop": "art"} }, + { + "old": {"shop": "organic"}, + "replace": {"shop": "supermarket", "organic": "only"} + }, { "old": {"shop": "perfume"}, "replace": {"shop": "perfumery"} diff --git a/data/presets.yaml b/data/presets.yaml index 9d4cb0ea2..68475bb79 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6239,7 +6239,6 @@ en: shop/boutique: # shop=boutique name: Boutique - terms: '' shop/butcher: # shop=butcher name: Butcher @@ -6301,6 +6300,7 @@ en: shop/clothes: # shop=clothes name: Clothing Store + # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: '' shop/coffee: # shop=coffee @@ -6399,7 +6399,6 @@ en: shop/fashion: # shop=fashion name: Fashion Store - terms: '' shop/fireplace: # shop=fireplace name: Fireplace Store diff --git a/data/presets/presets.json b/data/presets/presets.json index 8b479deb3..d60e72c40 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -877,6 +877,8 @@ "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, + "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"}, + "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"}, "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false}, "shop/furnace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false}, "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false}, @@ -898,7 +900,6 @@ "shop/bicycle": {"icon": "maki-bicycle", "fields": ["{shop}", "service/bicycle"], "geometry": ["point", "area"], "terms": ["bike", "repair", "tricycle", "unicycle"], "tags": {"shop": "bicycle"}, "name": "Bicycle Shop"}, "shop/bookmaker": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"}, "shop/books": {"icon": "maki-shop", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"}, - "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "name": "Boutique"}, "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"}, "shop/candles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"}, "shop/car_parts": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"}, @@ -911,7 +912,7 @@ "shop/cheese": {"icon": "fas-cheese", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"}, "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"}, "name": "Clothing 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/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"}, @@ -932,7 +933,6 @@ "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"}, "shop/fabric": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"}, "shop/farm": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["farm shop", "farm stand"], "tags": {"shop": "farm"}, "name": "Produce Stand"}, - "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "name": "Fashion Store"}, "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"}, "shop/fishing": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"}, "shop/florist": {"icon": "maki-florist", "geometry": ["point", "area"], "terms": ["flower"], "tags": {"shop": "florist"}, "name": "Florist"}, diff --git a/data/presets/presets/shop/boutique.json b/data/presets/presets/shop/_boutique.json similarity index 90% rename from data/presets/presets/shop/boutique.json rename to data/presets/presets/shop/_boutique.json index 5100c0d68..63de468fa 100644 --- a/data/presets/presets/shop/boutique.json +++ b/data/presets/presets/shop/_boutique.json @@ -12,5 +12,6 @@ "tags": { "shop": "boutique" }, + "searchable": false, "name": "Boutique" } diff --git a/data/presets/presets/shop/fashion.json b/data/presets/presets/shop/_fashion.json similarity index 90% rename from data/presets/presets/shop/fashion.json rename to data/presets/presets/shop/_fashion.json index f5e2535ec..44769b886 100644 --- a/data/presets/presets/shop/fashion.json +++ b/data/presets/presets/shop/_fashion.json @@ -12,5 +12,6 @@ "tags": { "shop": "fashion" }, + "searchable": false, "name": "Fashion Store" } diff --git a/data/presets/presets/shop/clothes.json b/data/presets/presets/shop/clothes.json index 9d2b265c5..de623febc 100644 --- a/data/presets/presets/shop/clothes.json +++ b/data/presets/presets/shop/clothes.json @@ -12,5 +12,21 @@ "tags": { "shop": "clothes" }, + "terms": [ + "blouses", + "boutique", + "bras", + "clothes", + "dresses", + "fashion", + "pants", + "shirts", + "shorts", + "skirts", + "slacks", + "socks", + "suits", + "underwear" + ], "name": "Clothing Store" } diff --git a/data/taginfo.json b/data/taginfo.json index a92b05264..ad7360b09 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -820,6 +820,8 @@ {"key": "seamark:buoy_lateral:colour", "value": "red", "description": "🄿 Red Buoy, 🄵 Color", "object_types": ["node"]}, {"key": "seamark:type", "value": "mooring", "description": "🄿 Mooring", "object_types": ["node"]}, {"key": "shop", "description": "🄿 Shop, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, + {"key": "shop", "value": "boutique", "description": "🄿 Boutique (unsearchable), 🄳 ➜ shop=clothes", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, + {"key": "shop", "value": "fashion", "description": "🄿 Fashion Store (unsearchable), 🄳 ➜ shop=clothes", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "fishmonger", "description": "🄿 Fishmonger (unsearchable), 🄳 ➜ shop=seafood", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "furnace", "description": "🄿 Furnace Store (unsearchable), 🄳 ➜ shop=fireplace", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "vacant", "description": "🄿 Vacant Shop (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, @@ -841,7 +843,6 @@ {"key": "shop", "value": "bicycle", "description": "🄿 Bicycle Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, - {"key": "shop", "value": "boutique", "description": "🄿 Boutique", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bacon.svg?sanitize=true"}, {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"}, @@ -874,7 +875,6 @@ {"key": "shop", "value": "erotic", "description": "🄿 Erotic Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "fabric", "description": "🄿 Fabric Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "farm", "description": "🄿 Produce Stand", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, - {"key": "shop", "value": "fashion", "description": "🄿 Fashion Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "fireplace", "description": "🄿 Fireplace Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "fishing", "description": "🄿 Fishing Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "florist", "description": "🄿 Florist", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/florist-15.svg?sanitize=true"}, @@ -1723,9 +1723,9 @@ {"key": "roof:color", "description": "🄳 ➜ roof:colour=*"}, {"key": "route", "value": "ncn", "description": "🄳 ➜ route=bicycle + network=ncn"}, {"key": "shop", "value": "betting", "description": "🄳 ➜ shop=bookmaker"}, - {"key": "shop", "value": "organic", "description": "🄳 ➜ shop=supermarket + organic=only"}, {"key": "shop", "value": "fish", "description": "🄳 ➜ shop=seafood"}, {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"}, + {"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": "sloped_curb", "value": "0", "description": "🄳 ➜ kerb=flush"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index b6b95e955..7957500dd 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7482,6 +7482,14 @@ "name": "Shop", "terms": "" }, + "shop/boutique": { + "name": "Boutique", + "terms": "" + }, + "shop/fashion": { + "name": "Fashion Store", + "terms": "" + }, "shop/fishmonger": { "name": "Fishmonger", "terms": "" @@ -7566,10 +7574,6 @@ "name": "Book Store", "terms": "" }, - "shop/boutique": { - "name": "Boutique", - "terms": "" - }, "shop/butcher": { "name": "Butcher", "terms": "chicken,beef,lamb,meat,pork" @@ -7620,7 +7624,7 @@ }, "shop/clothes": { "name": "Clothing Store", - "terms": "" + "terms": "blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear" }, "shop/coffee": { "name": "Coffee Store", @@ -7702,10 +7706,6 @@ "name": "Produce Stand", "terms": "farm shop,farm stand" }, - "shop/fashion": { - "name": "Fashion Store", - "terms": "" - }, "shop/fireplace": { "name": "Fireplace Store", "terms": "fireplace,stove,masonry heater"