Skip to content

Commit

Permalink
Deprecated shop=fashion and shop=boutique (close #6109)
Browse files Browse the repository at this point in the history 
Add clothing-related search terms to Clothing Shop preset
  • Loading branch information
@quincylvania
quincylvania committed Mar 27, 2019
1 parent 8d210e8 commit d76baa9
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 19 deletions.
12 changes: 10 additions & 2 deletions data/deprecated.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -351,6 +355,10 @@
"old": {"shop": "gallery"},
"replace": {"shop": "art"}
},
{
"old": {"shop": "organic"},
"replace": {"shop": "supermarket", "organic": "only"}

This comment has been minimized.

Sign in to view

Copy link
@matkoniecz

matkoniecz Mar 27, 2019 •
edited
Loading

Contributor

That seems really poor idea for me. Many of the (in fact, all of them) shops that can be tagged this way in my city are rather shop=convenience

This comment has been minimized.

Sign in to view

Copy link
@matkoniecz

matkoniecz Mar 27, 2019

Contributor

Maybe shop=yes + organic=only would be a better idea?

This comment has been minimized.

Sign in to view

Copy link
@quincylvania

quincylvania Mar 27, 2019 •
edited
Loading

Author Collaborator

This deprecation has been in iD since we added validation, I just changed the order in this PR. I don't find either of those options particularly better. I'm not too worried about it since there are fewer than 700 uses of shop=organic. People can also set the tag manually.

This comment has been minimized.

Sign in to view

Copy link
@bhousel

bhousel Mar 27, 2019

Member

Maybe shop=yes + organic=only would be a better idea?

lol I thought you hated shop=yes .. Upgrading them to that would just trigger a different validation.

This comment has been minimized.

Sign in to view

Copy link
@matkoniecz

matkoniecz Mar 27, 2019

Contributor

Yes, I dislike shop=yes. The problem is that shop=organic is actually shop=yes in disguise (but if it dropped to just 700 uses then it is less important, I seem to remember that once it was more popular).

In the same way moving shop=yes to shop=supermarket would not actually help.

Sometimes with multiple broken things fixing one issue may trigger new warnings and that is OK (though confusing for user it is sometimes unavoidable if many things were broken at once).
},
{
"old": {"shop": "perfume"},
"replace": {"shop": "perfumery"}
Expand Down
3 changes: 1 addition & 2 deletions data/presets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6239,7 +6239,6 @@ en:
shop/boutique:
# shop=boutique
name: Boutique
terms: '<translate with synonyms or related terms for ''Boutique'', separated by commas>'
shop/butcher:
# shop=butcher
name: Butcher
Expand Down Expand Up @@ -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: '<translate with synonyms or related terms for ''Clothing Store'', separated by commas>'
shop/coffee:
# shop=coffee
Expand Down Expand Up @@ -6399,7 +6399,6 @@ en:
shop/fashion:
# shop=fashion
name: Fashion Store
terms: '<translate with synonyms or related terms for ''Fashion Store'', separated by commas>'
shop/fireplace:
# shop=fireplace
name: Fireplace Store
Expand Down
6 changes: 3 additions & 3 deletions data/presets/presets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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"},
Expand All @@ -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"},
Expand All @@ -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"},
Expand Down
1 change: 1 addition & 0 deletions data/presets/presets/shop/boutique.json → data/presets/presets/shop/_boutique.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
"tags": {
"shop": "boutique"
},
"searchable": false,
"name": "Boutique"
}
1 change: 1 addition & 0 deletions data/presets/presets/shop/fashion.json → data/presets/presets/shop/_fashion.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
"tags": {
"shop": "fashion"
},
"searchable": false,
"name": "Fashion Store"
}
16 changes: 16 additions & 0 deletions data/presets/presets/shop/clothes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
6 changes: 3 additions & 3 deletions data/taginfo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down
18 changes: 9 additions & 9 deletions dist/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7482,6 +7482,14 @@
"name": "Shop",
"terms": ""
},
"shop/boutique": {
"name": "Boutique",
"terms": ""
},
"shop/fashion": {
"name": "Fashion Store",
"terms": ""
},
"shop/fishmonger": {
"name": "Fishmonger",
"terms": ""
Expand Down Expand Up @@ -7566,10 +7574,6 @@
"name": "Book Store",
"terms": ""
},
"shop/boutique": {
"name": "Boutique",
"terms": ""
},
"shop/butcher": {
"name": "Butcher",
"terms": "chicken,beef,lamb,meat,pork"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit d76baa9

Please sign in to comment.