diff --git a/data/deprecated.json b/data/deprecated.json index d8568d72f..697e87424 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -236,6 +236,10 @@ "old": {"camp_site": "camp_pitch"}, "replace": {"tourism": "camp_pitch"} }, + { + "old": {"shop": "clothes", "clothes": "second_hand"}, + "replace": {"shop": "clothes", "second_hand": "yes"} + }, { "old": {"color": "*"}, "replace": {"colour": "$1"} diff --git a/data/presets.yaml b/data/presets.yaml index 93b78aff2..c0bccbed1 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7468,6 +7468,11 @@ en: name: Car Dealership # 'terms: automobile,automotive' terms: '' + shop/car/second_hand: + # 'shop=car, second_hand=only' + name: Used Car Dealership + # 'terms: automobile,automotive' + terms: '' shop/car_parts: # shop=car_parts name: Car Parts Store @@ -7516,6 +7521,11 @@ en: name: Clothing Store # 'terms: blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear' terms: '' + shop/clothes/second_hand: + # 'shop=clothes, second_hand=only' + name: Secondhand Clothing Store + # 'terms: blouses,clothes,consignment,dresses,pants,second hand,shirts,shorts,skirts,slacks,suits,used' + terms: '' shop/clothes/underwear: # 'shop=clothes, clothes=underwear' name: Underwear Store diff --git a/data/presets/presets.json b/data/presets/presets.json index 289ec7834..9895d0a0e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1046,6 +1046,7 @@ "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"}, "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"}, "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"}, + "shop/car/second_hand": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car", "second_hand": "only"}, "name": "Used Car Dealership"}, "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"}, "shop/carpet": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"}, "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"}, @@ -1054,6 +1055,7 @@ "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"}, "shop/chocolate": {"icon": "maki-confectionery", "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/second_hand": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "second_hand": "only"}, "terms": ["blouses", "clothes", "consignment", "dresses", "pants", "second hand", "shirts", "shorts", "skirts", "slacks", "suits", "used"], "name": "Secondhand 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", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"}, "shop/coffee": {"icon": "temaki-coffee", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"}, "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "laptop", "hardware", "operating system", "software"], "name": "Computer Store"}, diff --git a/data/presets/presets/shop/car/second_hand.json b/data/presets/presets/shop/car/second_hand.json new file mode 100644 index 000000000..5ebfbd87c --- /dev/null +++ b/data/presets/presets/shop/car/second_hand.json @@ -0,0 +1,16 @@ +{ + "icon": "maki-car", + "geometry": [ + "point", + "area" + ], + "terms": [ + "automobile", + "automotive" + ], + "tags": { + "shop": "car", + "second_hand": "only" + }, + "name": "Used Car Dealership" +} diff --git a/data/presets/presets/shop/clothes/second_hand.json b/data/presets/presets/shop/clothes/second_hand.json new file mode 100644 index 000000000..241843671 --- /dev/null +++ b/data/presets/presets/shop/clothes/second_hand.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-clothing-store", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "clothes", + "second_hand": "only" + }, + "terms": [ + "blouses", + "clothes", + "consignment", + "dresses", + "pants", + "second hand", + "shirts", + "shorts", + "skirts", + "slacks", + "suits", + "used" + ], + "name": "Secondhand Clothing Store" +} diff --git a/data/taginfo.json b/data/taginfo.json index ef9769556..06fcfb3c8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -990,6 +990,7 @@ {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-car-battery.svg"}, {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-repair-15.svg"}, {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, + {"key": "second_hand", "value": "only", "description": "🄿 Used Car Dealership, 🄿 Secondhand Clothing Store, 🄵 Sells Used", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rv_park.svg"}, {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"}, {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, @@ -1767,7 +1768,6 @@ {"key": "seats", "description": "🄵 Seats"}, {"key": "second_hand", "value": "yes", "description": "🄵 Sells Used"}, {"key": "second_hand", "value": "no", "description": "🄵 Sells Used"}, - {"key": "second_hand", "value": "only", "description": "🄵 Sells Used"}, {"key": "self_service", "description": "🄵 Self-Service"}, {"key": "service", "value": "spur", "description": "🄵 Service Type"}, {"key": "service", "value": "yard", "description": "🄵 Service Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index b33926cdd..1181eeba6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8954,6 +8954,10 @@ "name": "Car Dealership", "terms": "automobile,automotive" }, + "shop/car/second_hand": { + "name": "Used Car Dealership", + "terms": "automobile,automotive" + }, "shop/caravan": { "name": "RV Dealership", "terms": "auto,camper,recreational vehicle" @@ -8986,6 +8990,10 @@ "name": "Clothing Store", "terms": "blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear" }, + "shop/clothes/second_hand": { + "name": "Secondhand Clothing Store", + "terms": "blouses,clothes,consignment,dresses,pants,second hand,shirts,shorts,skirts,slacks,suits,used" + }, "shop/clothes/underwear": { "name": "Underwear Store", "terms": "boutique,bras,brassieres,briefs,boxers,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies"