From 98f0dce72055dc79e52312a57bcc47118911e9c4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 31 May 2022 14:07:46 +0200 Subject: [PATCH 01/11] Add aliases and terms for shop=* presets. Corrected shop=deli preset name Sources: English Wikipedia, OpenStreetMap Wiki --- data/presets/shop/antiques.json | 5 ++++- data/presets/shop/bookmaker.json | 9 +++++---- data/presets/shop/books.json | 7 ++++++- data/presets/shop/butcher.json | 5 ++++- data/presets/shop/car.json | 5 ++++- data/presets/shop/car_repair.json | 7 +++++-- data/presets/shop/clothes/underwear.json | 1 + data/presets/shop/confectionery.json | 10 ++++++++-- data/presets/shop/convenience.json | 13 ++++++++++++- data/presets/shop/copyshop.json | 5 ++++- data/presets/shop/country_store.json | 5 ++++- data/presets/shop/deli.json | 8 +++++++- data/presets/shop/funeral_directors.json | 8 ++++++-- data/presets/shop/games.json | 7 +++++-- data/presets/shop/garden_centre.json | 5 ++++- data/presets/shop/general.json | 8 +++++++- data/presets/shop/gift.json | 7 +++++-- data/presets/shop/greengrocer.json | 6 +++++- data/presets/shop/hairdresser.json | 4 +++- data/presets/shop/hairdresser_supply.json | 2 ++ data/presets/shop/hardware.json | 5 ++++- data/presets/shop/health_food.json | 14 +++++++++++--- data/presets/shop/herbalist.json | 9 +++++++++ data/presets/shop/houseware.json | 6 ++++-- data/presets/shop/jewelry.json | 5 ++++- data/presets/shop/kiosk.json | 11 ++++++++++- data/presets/shop/laundry/self_service.json | 6 +++--- data/presets/shop/mall.json | 6 +++++- data/presets/shop/model.json | 2 ++ data/presets/shop/money_lender.json | 3 +++ data/presets/shop/motorcycle_repair.json | 5 ++++- data/presets/shop/musical_instrument.json | 13 ++++++++++++- data/presets/shop/newsagent.json | 5 ++++- data/presets/shop/nutrition_supplements.json | 1 + data/presets/shop/pawnbroker.json | 6 +++++- data/presets/shop/pet.json | 5 ++++- data/presets/shop/seafood.json | 4 ++-- data/presets/shop/second_hand.json | 7 ++++++- data/presets/shop/stationery.json | 5 ++++- data/presets/shop/ticket.json | 5 ++++- data/presets/shop/toys.json | 3 ++- data/presets/shop/variety_store.json | 10 +++++++++- data/presets/shop/water_sports.json | 3 +++ 43 files changed, 216 insertions(+), 50 deletions(-) diff --git a/data/presets/shop/antiques.json b/data/presets/shop/antiques.json index b8682ca1e..bbbed8f83 100644 --- a/data/presets/shop/antiques.json +++ b/data/presets/shop/antiques.json @@ -7,5 +7,8 @@ "tags": { "shop": "antiques" }, - "name": "Antiques Shop" + "name": "Antiques Shop", + "aliases": [ + "Antique Shop" + ] } diff --git a/data/presets/shop/bookmaker.json b/data/presets/shop/bookmaker.json index 7b0541399..5cca23c7e 100644 --- a/data/presets/shop/bookmaker.json +++ b/data/presets/shop/bookmaker.json @@ -13,10 +13,11 @@ }, "terms": [ "betting", - "bookie", "gamble", - "gambling", - "turf accountant" + "gambling" ], - "name": "Bookmaker" + "name": "Bookmaker", + "aliases": [ + "Bookie", + "Turf Accountant" } diff --git a/data/presets/shop/books.json b/data/presets/shop/books.json index 48d51ec77..76b0ce890 100644 --- a/data/presets/shop/books.json +++ b/data/presets/shop/books.json @@ -16,5 +16,10 @@ "tags": { "shop": "books" }, - "name": "Book Store" + "name": "Book Store", + "aliases": [ + "Bookstore", + "Bookshop", + "Bookseller" + ] } diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json index de2e3f437..647573b91 100644 --- a/data/presets/shop/butcher.json +++ b/data/presets/shop/butcher.json @@ -14,5 +14,8 @@ "tags": { "shop": "butcher" }, - "name": "Butcher" + "name": "Butcher", + "aliases": [ + "Butcher Shop" + ] } diff --git a/data/presets/shop/car.json b/data/presets/shop/car.json index 32a504b6e..514d9a47f 100644 --- a/data/presets/shop/car.json +++ b/data/presets/shop/car.json @@ -18,5 +18,8 @@ "tags": { "shop": "car" }, - "name": "Car Dealership" + "name": "Car Dealership", + "aliases": [ + "Car Dealer" + ] } diff --git a/data/presets/shop/car_repair.json b/data/presets/shop/car_repair.json index f6225dfd7..99a7e16fb 100644 --- a/data/presets/shop/car_repair.json +++ b/data/presets/shop/car_repair.json @@ -11,7 +11,6 @@ "terms": [ "auto mechanic", "automechanic", - "automobile", "automotive", "garage", "inspection", @@ -21,5 +20,9 @@ "tags": { "shop": "car_repair" }, - "name": "Car Repair Shop" + "name": "Car Repair Shop", + "aliases": [ + "Automobile Repair Shop", + "Automobile Repair Workshop" + ] } diff --git a/data/presets/shop/clothes/underwear.json b/data/presets/shop/clothes/underwear.json index 4eea770a5..57c70e968 100644 --- a/data/presets/shop/clothes/underwear.json +++ b/data/presets/shop/clothes/underwear.json @@ -18,6 +18,7 @@ "brassieres", "briefs", "boxers", + "dessous", "fashion", "lingerie", "panties", diff --git a/data/presets/shop/confectionery.json b/data/presets/shop/confectionery.json index cd6477220..dece17138 100644 --- a/data/presets/shop/confectionery.json +++ b/data/presets/shop/confectionery.json @@ -5,10 +5,16 @@ "area" ], "terms": [ - "sweet" + "sweet", + "lollipop", + "sugar" ], "tags": { "shop": "confectionery" }, - "name": "Candy Store" + "name": "Candy Store", + "aliases": [ + "Candy Shop", + "Confectionery Store" + ] } diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json index bb77986b1..3fdcce81e 100644 --- a/data/presets/shop/convenience.json +++ b/data/presets/shop/convenience.json @@ -11,5 +11,16 @@ "tags": { "shop": "convenience" }, - "name": "Convenience Store" + "terms": [ + "bodega", + "mini-mart", + "mini-market" + ] + "name": "Convenience Store", + "aliases": [ + "Convenience Shop", + "Corner Store", + "Corner Shop", + "Superette" + ] } diff --git a/data/presets/shop/copyshop.json b/data/presets/shop/copyshop.json index 79f60f8d9..bda5ddca8 100644 --- a/data/presets/shop/copyshop.json +++ b/data/presets/shop/copyshop.json @@ -11,5 +11,8 @@ "print", "scan" ], - "name": "Copy Store" + "name": "Copy Store", + "aliases": [ + "Copy Shop" + ] } diff --git a/data/presets/shop/country_store.json b/data/presets/shop/country_store.json index e4701b490..55050532a 100644 --- a/data/presets/shop/country_store.json +++ b/data/presets/shop/country_store.json @@ -7,5 +7,8 @@ "tags": { "shop": "country_store" }, - "name": "Country Store" + "name": "Country Store", + "aliases": [ + "Rural Supplies Store" + ] } diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index 2db092053..c050b73ef 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -5,6 +5,8 @@ "area" ], "terms": [ + "deli", + "delicatessen", "lunch", "meat", "sandwich" @@ -12,5 +14,9 @@ "tags": { "shop": "deli" }, - "name": "Deli" + "name": "Gourmet Food Store" + "aliases": [ + "Fine Food Store", + "Gourmet Food Shop" + ] } diff --git a/data/presets/shop/funeral_directors.json b/data/presets/shop/funeral_directors.json index 44cb64dc4..ae88ef135 100644 --- a/data/presets/shop/funeral_directors.json +++ b/data/presets/shop/funeral_directors.json @@ -11,10 +11,14 @@ ], "terms": [ "undertaker", - "memorial home" + "memorial home", + "mortuary" ], "tags": { "shop": "funeral_directors" }, - "name": "Funeral Home" + "name": "Funeral Home", + "aliases": [ + "Funeral Parlor" + ] } diff --git a/data/presets/shop/games.json b/data/presets/shop/games.json index 15a74a5f2..243e6596c 100644 --- a/data/presets/shop/games.json +++ b/data/presets/shop/games.json @@ -12,9 +12,12 @@ "card game", "dice game", "game shop", + "larp", "live action role-playing game", - "miniatures wargame", - "strategy game" + "miniature wargame", + "role-playing", + "strategy game", + "wargame", ], "name": "Tabletop Game Store" } diff --git a/data/presets/shop/garden_centre.json b/data/presets/shop/garden_centre.json index edd4817f8..98f450801 100644 --- a/data/presets/shop/garden_centre.json +++ b/data/presets/shop/garden_centre.json @@ -7,8 +7,11 @@ "terms": [ "landscape", "mulch", + "nursery", + "plant nursery", + "retail plant nursery", "shrub", - "tree" + "tree", ], "tags": { "shop": "garden_centre" diff --git a/data/presets/shop/general.json b/data/presets/shop/general.json index 293b1e78f..325a6da6c 100644 --- a/data/presets/shop/general.json +++ b/data/presets/shop/general.json @@ -8,7 +8,13 @@ "shop": "general" }, "terms": [ + "small-town store", "village shop" ], - "name": "General Store" + "name": "General Store", + "aliases": [ + "General Merchant Store", + "General Merchandise Store", + "General Dealer" + ] } diff --git a/data/presets/shop/gift.json b/data/presets/shop/gift.json index d53afbd50..81809a42f 100644 --- a/data/presets/shop/gift.json +++ b/data/presets/shop/gift.json @@ -5,10 +5,13 @@ "area" ], "terms": [ - "souvenir" + "tourist trap" ], "tags": { "shop": "gift" }, - "name": "Gift Shop" + "name": "Gift Shop", + "aliases": [ + "Souvenir Shop" + ] } diff --git a/data/presets/shop/greengrocer.json b/data/presets/shop/greengrocer.json index adcc27c66..eac27802c 100644 --- a/data/presets/shop/greengrocer.json +++ b/data/presets/shop/greengrocer.json @@ -16,5 +16,9 @@ "tags": { "shop": "greengrocer" }, - "name": "Greengrocer" + "name": "Greengrocer", + "aliases": [ + "Produce Store", + "Produce Shop" + ] } diff --git a/data/presets/shop/hairdresser.json b/data/presets/shop/hairdresser.json index e718ce2c6..f4c7c1a03 100644 --- a/data/presets/shop/hairdresser.json +++ b/data/presets/shop/hairdresser.json @@ -5,7 +5,9 @@ "area" ], "terms": [ - "barber" + "barber", + "beard", + "salon" ], "tags": { "shop": "hairdresser" diff --git a/data/presets/shop/hairdresser_supply.json b/data/presets/shop/hairdresser_supply.json index 3b16dab80..a2d8c1d3b 100644 --- a/data/presets/shop/hairdresser_supply.json +++ b/data/presets/shop/hairdresser_supply.json @@ -6,7 +6,9 @@ ], "terms": [ "barber", + "razor", "shampoo", + "shaver", "conditioner" ], "tags": { diff --git a/data/presets/shop/hardware.json b/data/presets/shop/hardware.json index cd210fe62..2d90b2643 100644 --- a/data/presets/shop/hardware.json +++ b/data/presets/shop/hardware.json @@ -15,5 +15,8 @@ "home improvement", "tools" ], - "name": "Hardware Store" + "name": "Hardware Store", + "aliases": [ + "Hardware Shop" + ] } diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json index 762ac75eb..a6cf56f59 100644 --- a/data/presets/shop/health_food.json +++ b/data/presets/shop/health_food.json @@ -5,13 +5,21 @@ "area" ], "terms": [ - "wholefood", + "groceries", + "nutritional", + "organic", + "raw food", + "unprocessed", "vitamins", "vegetarian", - "vegan" + "vegan", + "wholefood", ], "tags": { "shop": "health_food" }, - "name": "Health Food Shop" + "name": "Health Food Shop", + "aliases": [ + "Health Food Store" + ] } diff --git a/data/presets/shop/herbalist.json b/data/presets/shop/herbalist.json index 49f1b0407..1e64f28a5 100644 --- a/data/presets/shop/herbalist.json +++ b/data/presets/shop/herbalist.json @@ -7,5 +7,14 @@ "tags": { "shop": "herbalist" }, + "terms": [ + "ayurveda", + "ayurvedic", + "medicinal plants", + "paraherbal", + "phytomedicine", + "plant medicine", + "traditional medicine" + ], "name": "Herbalist" } diff --git a/data/presets/shop/houseware.json b/data/presets/shop/houseware.json index 487153cd7..f17b3293d 100644 --- a/data/presets/shop/houseware.json +++ b/data/presets/shop/houseware.json @@ -6,11 +6,13 @@ ], "terms": [ "home", - "household", "kitchenware" ], "tags": { "shop": "houseware" }, - "name": "Houseware Store" + "name": "Houseware Store", + "aliases": [ + "Household Goods Store" + ] } diff --git a/data/presets/shop/jewelry.json b/data/presets/shop/jewelry.json index e993cd025..8cfd6eb8c 100644 --- a/data/presets/shop/jewelry.json +++ b/data/presets/shop/jewelry.json @@ -21,5 +21,8 @@ "tags": { "shop": "jewelry" }, - "name": "Jewelry Store" + "name": "Jewelry Store", + "aliases": [ + "Jewelry Shop" + ] } diff --git a/data/presets/shop/kiosk.json b/data/presets/shop/kiosk.json index 6a1437d37..4eed51b1a 100644 --- a/data/presets/shop/kiosk.json +++ b/data/presets/shop/kiosk.json @@ -7,5 +7,14 @@ "tags": { "shop": "kiosk" }, - "name": "Kiosk" + "terms": [ + "beverages", + "cigarettes", + "mall kiosk", + "newsagent", + "newspaper", + "snacks", + "sweets", + ] + "name": "Kiosk", } diff --git a/data/presets/shop/laundry/self_service.json b/data/presets/shop/laundry/self_service.json index e15727ec8..d396fdf5f 100644 --- a/data/presets/shop/laundry/self_service.json +++ b/data/presets/shop/laundry/self_service.json @@ -8,12 +8,12 @@ "shop": "laundry", "self_service": "yes" }, - "terms": [ + "name": "Self-Service Laundry", + "aliases": [ "Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria" - ], - "name": "Self-Service Laundry" + ] } diff --git a/data/presets/shop/mall.json b/data/presets/shop/mall.json index ed943cf75..00b43c07d 100644 --- a/data/presets/shop/mall.json +++ b/data/presets/shop/mall.json @@ -10,5 +10,9 @@ "tags": { "shop": "mall" }, - "name": "Mall" + "name": "Mall", + "aliases": [ + "Shopping Mall", + "Shopping Center" + ] } diff --git a/data/presets/shop/model.json b/data/presets/shop/model.json index f27b3e060..9e2f3c001 100644 --- a/data/presets/shop/model.json +++ b/data/presets/shop/model.json @@ -12,7 +12,9 @@ "model building", "model figures", "model kits", + "model railroading", "model store", + "rail transport modelling", "scale models" ], "name": "Model Shop" diff --git a/data/presets/shop/money_lender.json b/data/presets/shop/money_lender.json index a5a37dcd9..5510a0035 100644 --- a/data/presets/shop/money_lender.json +++ b/data/presets/shop/money_lender.json @@ -11,5 +11,8 @@ "tags": { "shop": "money_lender" }, + "terms": [ + "payday loan" + ], "name": "Money Lender" } diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json index 13bb316ad..57bb4c4cb 100644 --- a/data/presets/shop/motorcycle_repair.json +++ b/data/presets/shop/motorcycle_repair.json @@ -19,5 +19,8 @@ "tags": { "shop": "motorcycle_repair" }, - "name": "Motorcycle Repair Shop" + "name": "Motorcycle Repair Shop", + "aliases": [ + "Motorcycle Repair Workshop", + ] } diff --git a/data/presets/shop/musical_instrument.json b/data/presets/shop/musical_instrument.json index 4d99fed34..18c4f9999 100644 --- a/data/presets/shop/musical_instrument.json +++ b/data/presets/shop/musical_instrument.json @@ -5,7 +5,18 @@ "area" ], "terms": [ - "guitar" + "accordion", + "brass instruments", + "cello", + "clarinet", + "drum", + "flute", + "guitar", + "keyboard", + "piano", + "saxophone", + "trumpet", + "violin" ], "tags": { "shop": "musical_instrument" diff --git a/data/presets/shop/newsagent.json b/data/presets/shop/newsagent.json index 8f7cc57ac..529612835 100644 --- a/data/presets/shop/newsagent.json +++ b/data/presets/shop/newsagent.json @@ -7,5 +7,8 @@ "tags": { "shop": "newsagent" }, - "name": "Newspaper/Magazine Shop" + "name": "Newspaper/Magazine Shop", + "aliases": [ + "Newsstand" + ] } diff --git a/data/presets/shop/nutrition_supplements.json b/data/presets/shop/nutrition_supplements.json index 1199da5dd..3b88d0269 100644 --- a/data/presets/shop/nutrition_supplements.json +++ b/data/presets/shop/nutrition_supplements.json @@ -6,6 +6,7 @@ ], "terms": [ "health", + "protein", "supplement", "vitamin" ], diff --git a/data/presets/shop/pawnbroker.json b/data/presets/shop/pawnbroker.json index 0ce584243..6390a61b3 100644 --- a/data/presets/shop/pawnbroker.json +++ b/data/presets/shop/pawnbroker.json @@ -7,5 +7,9 @@ "tags": { "shop": "pawnbroker" }, - "name": "Pawn Shop" + "name": "Pawn Shop", + "aliases": [ + "Pawnshop", + "Pawnbroker" + ] } diff --git a/data/presets/shop/pet.json b/data/presets/shop/pet.json index 4bf517353..e4acb6d44 100644 --- a/data/presets/shop/pet.json +++ b/data/presets/shop/pet.json @@ -16,5 +16,8 @@ "tags": { "shop": "pet" }, - "name": "Pet Store" + "name": "Pet Store", + "aliases": [ + "Pet Shop" + ] } diff --git a/data/presets/shop/seafood.json b/data/presets/shop/seafood.json index 421deddfb..f6c7e2171 100644 --- a/data/presets/shop/seafood.json +++ b/data/presets/shop/seafood.json @@ -4,8 +4,8 @@ "point", "area" ], - "terms": [ - "fishmonger" + "aliases": [ + "Fishmonger" ], "tags": { "shop": "seafood" diff --git a/data/presets/shop/second_hand.json b/data/presets/shop/second_hand.json index f814f4e59..aa0ccc6fd 100644 --- a/data/presets/shop/second_hand.json +++ b/data/presets/shop/second_hand.json @@ -18,5 +18,10 @@ "tags": { "shop": "second_hand" }, - "name": "Consignment/Thrift Store" + "name": "Thrift Store", + "aliases": [ + "Thrift Shop", + "Consignment Store", + "Resale Shop" + ] } diff --git a/data/presets/shop/stationery.json b/data/presets/shop/stationery.json index eba3c3395..1613b4069 100644 --- a/data/presets/shop/stationery.json +++ b/data/presets/shop/stationery.json @@ -11,5 +11,8 @@ "tags": { "shop": "stationery" }, - "name": "Stationery Store" + "name": "Stationery Store", + "aliases": [ + "Office Supply Shop" + ] } diff --git a/data/presets/shop/ticket.json b/data/presets/shop/ticket.json index cd9869d5e..bf5716a9b 100644 --- a/data/presets/shop/ticket.json +++ b/data/presets/shop/ticket.json @@ -10,5 +10,8 @@ "terms": [ "box office" ], - "name": "Ticket Seller" + "name": "Ticket Seller", + "aliases": [ + "Ticket Vendor" + ] } diff --git a/data/presets/shop/toys.json b/data/presets/shop/toys.json index 5245f92ed..881f94f1d 100644 --- a/data/presets/shop/toys.json +++ b/data/presets/shop/toys.json @@ -8,7 +8,8 @@ "shop": "toys" }, "terms": [ - "games" + "games", + "teddy" ], "name": "Toy Store" } diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index b5b4a4ccd..d6bb2c5ac 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -7,5 +7,13 @@ "tags": { "shop": "variety_store" }, - "name": "Variety Store" + "terms": [ + "discount", + "five and ten", + "five and dime" + ], + "name": "Variety Store", + "aliases": [ + "Dollar Store" + ], } diff --git a/data/presets/shop/water_sports.json b/data/presets/shop/water_sports.json index a05ce2b19..a62100039 100644 --- a/data/presets/shop/water_sports.json +++ b/data/presets/shop/water_sports.json @@ -7,5 +7,8 @@ "tags": { "shop": "water_sports" }, + "terms": [ + "swimwear" + ], "name": "Watersport/Swim Shop" } From a9967669cdfd5f227f524849f92932bb2f7c912e Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 31 May 2022 14:15:38 +0200 Subject: [PATCH 02/11] fix json syntax errors + validation warnings --- data/presets/shop/bookmaker.json | 1 + data/presets/shop/convenience.json | 2 +- data/presets/shop/deli.json | 2 +- data/presets/shop/games.json | 2 +- data/presets/shop/garden_centre.json | 2 +- data/presets/shop/health_food.json | 4 ++-- data/presets/shop/kiosk.json | 4 ++-- data/presets/shop/motorcycle_repair.json | 2 +- data/presets/shop/variety_store.json | 4 ++-- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/data/presets/shop/bookmaker.json b/data/presets/shop/bookmaker.json index 5cca23c7e..fe79bae46 100644 --- a/data/presets/shop/bookmaker.json +++ b/data/presets/shop/bookmaker.json @@ -20,4 +20,5 @@ "aliases": [ "Bookie", "Turf Accountant" + ] } diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json index 3fdcce81e..f18295820 100644 --- a/data/presets/shop/convenience.json +++ b/data/presets/shop/convenience.json @@ -15,7 +15,7 @@ "bodega", "mini-mart", "mini-market" - ] + ], "name": "Convenience Store", "aliases": [ "Convenience Shop", diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index c050b73ef..d9ee2794c 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -14,7 +14,7 @@ "tags": { "shop": "deli" }, - "name": "Gourmet Food Store" + "name": "Gourmet Food Store", "aliases": [ "Fine Food Store", "Gourmet Food Shop" diff --git a/data/presets/shop/games.json b/data/presets/shop/games.json index 243e6596c..b0b6b2817 100644 --- a/data/presets/shop/games.json +++ b/data/presets/shop/games.json @@ -17,7 +17,7 @@ "miniature wargame", "role-playing", "strategy game", - "wargame", + "wargame" ], "name": "Tabletop Game Store" } diff --git a/data/presets/shop/garden_centre.json b/data/presets/shop/garden_centre.json index 98f450801..dfb2616e7 100644 --- a/data/presets/shop/garden_centre.json +++ b/data/presets/shop/garden_centre.json @@ -11,7 +11,7 @@ "plant nursery", "retail plant nursery", "shrub", - "tree", + "tree" ], "tags": { "shop": "garden_centre" diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json index a6cf56f59..079b52031 100644 --- a/data/presets/shop/health_food.json +++ b/data/presets/shop/health_food.json @@ -10,10 +10,10 @@ "organic", "raw food", "unprocessed", - "vitamins", "vegetarian", "vegan", - "wholefood", + "vitamins", + "wholefood" ], "tags": { "shop": "health_food" diff --git a/data/presets/shop/kiosk.json b/data/presets/shop/kiosk.json index 4eed51b1a..536c37fc3 100644 --- a/data/presets/shop/kiosk.json +++ b/data/presets/shop/kiosk.json @@ -15,6 +15,6 @@ "newspaper", "snacks", "sweets", - ] - "name": "Kiosk", + ], + "name": "Kiosk" } diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json index 57bb4c4cb..582c70605 100644 --- a/data/presets/shop/motorcycle_repair.json +++ b/data/presets/shop/motorcycle_repair.json @@ -21,6 +21,6 @@ }, "name": "Motorcycle Repair Shop", "aliases": [ - "Motorcycle Repair Workshop", + "Motorcycle Repair Workshop" ] } diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index d6bb2c5ac..db16255f6 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -9,8 +9,8 @@ }, "terms": [ "discount", - "five and ten", - "five and dime" + "five and dime", + "five and ten" ], "name": "Variety Store", "aliases": [ From b6b722a7ca852ef2391ec3b1b7c88f3ead2ecd04 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 31 May 2022 14:17:11 +0200 Subject: [PATCH 03/11] fir more validation warnings --- data/presets/shop/kiosk.json | 2 +- data/presets/shop/variety_store.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/shop/kiosk.json b/data/presets/shop/kiosk.json index 536c37fc3..040911417 100644 --- a/data/presets/shop/kiosk.json +++ b/data/presets/shop/kiosk.json @@ -14,7 +14,7 @@ "newsagent", "newspaper", "snacks", - "sweets", + "sweets" ], "name": "Kiosk" } diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index db16255f6..da9cc75ec 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -15,5 +15,5 @@ "name": "Variety Store", "aliases": [ "Dollar Store" - ], + ] } From deb08b3fdb113ec2d3db4cad7a4b82680c3a23f4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 31 May 2022 23:13:36 +0200 Subject: [PATCH 04/11] Update ticket.json --- data/presets/shop/ticket.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/shop/ticket.json b/data/presets/shop/ticket.json index bf5716a9b..60d2b9cde 100644 --- a/data/presets/shop/ticket.json +++ b/data/presets/shop/ticket.json @@ -12,6 +12,7 @@ ], "name": "Ticket Seller", "aliases": [ - "Ticket Vendor" + "Ticket Vendor", + "Ticket Booth" ] } From 2573a8b68a2dfbd617b608df8ccb9a5c8a9e6da6 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Tue, 31 May 2022 23:58:50 +0200 Subject: [PATCH 05/11] apply review suggestions --- data/presets/shop/antiques.json | 6 ++++-- data/presets/shop/books.json | 8 +++++--- data/presets/shop/butcher.json | 3 ++- data/presets/shop/car_repair.json | 5 +++-- data/presets/shop/confectionery.json | 3 ++- data/presets/shop/convenience.json | 4 ++-- data/presets/shop/health_food.json | 4 ++-- data/presets/shop/kiosk.json | 1 + data/presets/shop/newsagent.json | 4 ++-- data/presets/shop/pawnbroker.json | 6 +++--- data/presets/shop/second_hand.json | 7 +++---- data/presets/shop/stationery.json | 2 +- data/presets/shop/variety_store.json | 6 +++--- 13 files changed, 33 insertions(+), 26 deletions(-) diff --git a/data/presets/shop/antiques.json b/data/presets/shop/antiques.json index bbbed8f83..41988ad76 100644 --- a/data/presets/shop/antiques.json +++ b/data/presets/shop/antiques.json @@ -7,8 +7,10 @@ "tags": { "shop": "antiques" }, - "name": "Antiques Shop", + "name": "Antique Shop", "aliases": [ - "Antique Shop" + "Antique Store", + "Antiques Shop", + "Antiques Store" ] } diff --git a/data/presets/shop/books.json b/data/presets/shop/books.json index 76b0ce890..36453f59b 100644 --- a/data/presets/shop/books.json +++ b/data/presets/shop/books.json @@ -16,10 +16,12 @@ "tags": { "shop": "books" }, - "name": "Book Store", + "name": "Bookstore", "aliases": [ - "Bookstore", "Bookshop", - "Bookseller" + "Bookseller", + "Book Store", + "Book Shop", + "Book Seller" ] } diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json index 647573b91..cd52e4cfc 100644 --- a/data/presets/shop/butcher.json +++ b/data/presets/shop/butcher.json @@ -16,6 +16,7 @@ }, "name": "Butcher", "aliases": [ - "Butcher Shop" + "Butcher Shop", + "Pork Store" ] } diff --git a/data/presets/shop/car_repair.json b/data/presets/shop/car_repair.json index 99a7e16fb..411d9405e 100644 --- a/data/presets/shop/car_repair.json +++ b/data/presets/shop/car_repair.json @@ -9,11 +9,11 @@ "area" ], "terms": [ - "auto mechanic", "automechanic", "automotive", "garage", "inspection", + "mechanic", "oil change", "service" ], @@ -23,6 +23,7 @@ "name": "Car Repair Shop", "aliases": [ "Automobile Repair Shop", - "Automobile Repair Workshop" + "Car Mechanic", + "Auto Mechanic", ] } diff --git a/data/presets/shop/confectionery.json b/data/presets/shop/confectionery.json index dece17138..8e4245868 100644 --- a/data/presets/shop/confectionery.json +++ b/data/presets/shop/confectionery.json @@ -5,9 +5,10 @@ "area" ], "terms": [ - "sweet", + "fudge", "lollipop", "sugar" + "sweet", ], "tags": { "shop": "confectionery" diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json index f18295820..1e47e445e 100644 --- a/data/presets/shop/convenience.json +++ b/data/presets/shop/convenience.json @@ -12,7 +12,6 @@ "shop": "convenience" }, "terms": [ - "bodega", "mini-mart", "mini-market" ], @@ -21,6 +20,7 @@ "Convenience Shop", "Corner Store", "Corner Shop", - "Superette" + "Superette", + "Bodega" ] } diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json index 079b52031..87ba6766a 100644 --- a/data/presets/shop/health_food.json +++ b/data/presets/shop/health_food.json @@ -18,8 +18,8 @@ "tags": { "shop": "health_food" }, - "name": "Health Food Shop", + "name": "Health Food Store", "aliases": [ - "Health Food Store" + "Health Food Shop" ] } diff --git a/data/presets/shop/kiosk.json b/data/presets/shop/kiosk.json index 040911417..eb0f21213 100644 --- a/data/presets/shop/kiosk.json +++ b/data/presets/shop/kiosk.json @@ -13,6 +13,7 @@ "mall kiosk", "newsagent", "newspaper", + "newsstand", "snacks", "sweets" ], diff --git a/data/presets/shop/newsagent.json b/data/presets/shop/newsagent.json index 529612835..2b0350a4c 100644 --- a/data/presets/shop/newsagent.json +++ b/data/presets/shop/newsagent.json @@ -7,8 +7,8 @@ "tags": { "shop": "newsagent" }, - "name": "Newspaper/Magazine Shop", + "name": "Newsstand", "aliases": [ - "Newsstand" + "Newspaper/Magazine Shop" ] } diff --git a/data/presets/shop/pawnbroker.json b/data/presets/shop/pawnbroker.json index 6390a61b3..d6a4dcdbb 100644 --- a/data/presets/shop/pawnbroker.json +++ b/data/presets/shop/pawnbroker.json @@ -7,9 +7,9 @@ "tags": { "shop": "pawnbroker" }, - "name": "Pawn Shop", + "name": "Pawnshop", "aliases": [ - "Pawnshop", - "Pawnbroker" + "Pawnbroker", + "Pawn Shop" ] } diff --git a/data/presets/shop/second_hand.json b/data/presets/shop/second_hand.json index aa0ccc6fd..b251680a8 100644 --- a/data/presets/shop/second_hand.json +++ b/data/presets/shop/second_hand.json @@ -9,10 +9,8 @@ "area" ], "terms": [ - "secondhand", - "second hand", + "second-hand", "resale", - "thrift", "used" ], "tags": { @@ -22,6 +20,7 @@ "aliases": [ "Thrift Shop", "Consignment Store", - "Resale Shop" + "Resale Shop", + "Secondhand Shop" ] } diff --git a/data/presets/shop/stationery.json b/data/presets/shop/stationery.json index 1613b4069..28c17a543 100644 --- a/data/presets/shop/stationery.json +++ b/data/presets/shop/stationery.json @@ -13,6 +13,6 @@ }, "name": "Stationery Store", "aliases": [ - "Office Supply Shop" + "Office Supply Store" ] } diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index da9cc75ec..172a057de 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -8,12 +8,12 @@ "shop": "variety_store" }, "terms": [ - "discount", "five and dime", "five and ten" ], - "name": "Variety Store", + "name": "Discount Store", "aliases": [ - "Dollar Store" + "Dollar Store", + "Variety Store", ] } From 9a5c14f5482e1483b62798a1704e6f37a944ddcd Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Wed, 1 Jun 2022 00:08:42 +0200 Subject: [PATCH 06/11] fix validator errors & warnings --- data/presets/shop/car_repair.json | 2 +- data/presets/shop/confectionery.json | 4 ++-- data/presets/shop/variety_store.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/presets/shop/car_repair.json b/data/presets/shop/car_repair.json index 411d9405e..a835b0547 100644 --- a/data/presets/shop/car_repair.json +++ b/data/presets/shop/car_repair.json @@ -24,6 +24,6 @@ "aliases": [ "Automobile Repair Shop", "Car Mechanic", - "Auto Mechanic", + "Auto Mechanic" ] } diff --git a/data/presets/shop/confectionery.json b/data/presets/shop/confectionery.json index 8e4245868..755ee14d8 100644 --- a/data/presets/shop/confectionery.json +++ b/data/presets/shop/confectionery.json @@ -7,8 +7,8 @@ "terms": [ "fudge", "lollipop", - "sugar" - "sweet", + "sugar", + "sweet" ], "tags": { "shop": "confectionery" diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index 172a057de..e6a0d24fa 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -14,6 +14,6 @@ "name": "Discount Store", "aliases": [ "Dollar Store", - "Variety Store", + "Variety Store" ] } From 2d034c68d1258a6c5d14732c4b900c1a0db860e2 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Wed, 1 Jun 2022 00:21:14 +0200 Subject: [PATCH 07/11] apply review suggestions --- data/presets/shop/deli.json | 3 ++- data/presets/shop/water_sports.json | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index d9ee2794c..d5915fca4 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -14,8 +14,9 @@ "tags": { "shop": "deli" }, - "name": "Gourmet Food Store", + "name": "Specialty Food Store", "aliases": [ + "Gourmet Food Store", "Fine Food Store", "Gourmet Food Shop" ] diff --git a/data/presets/shop/water_sports.json b/data/presets/shop/water_sports.json index a62100039..a05ce2b19 100644 --- a/data/presets/shop/water_sports.json +++ b/data/presets/shop/water_sports.json @@ -7,8 +7,5 @@ "tags": { "shop": "water_sports" }, - "terms": [ - "swimwear" - ], "name": "Watersport/Swim Shop" } From 01007da81fad4ed978c6f32640e271b96d666397 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Wed, 1 Jun 2022 13:03:01 +0200 Subject: [PATCH 08/11] apply review suggestions --- data/presets/amenity/fast_food/sandwich.json | 3 +++ data/presets/shop/deli.json | 10 ++++------ data/presets/shop/hairdresser.json | 5 ++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/data/presets/amenity/fast_food/sandwich.json b/data/presets/amenity/fast_food/sandwich.json index ab467cf91..6a8a4bde7 100644 --- a/data/presets/amenity/fast_food/sandwich.json +++ b/data/presets/amenity/fast_food/sandwich.json @@ -8,6 +8,8 @@ "breakfast", "cafe", "café", + "deli", + "deli sandwich", "dine", "dining", "dinner", @@ -15,6 +17,7 @@ "eat", "grill", "lunch", + "meat", "table" ], "tags": { diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index d5915fca4..29faec948 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -1,21 +1,19 @@ { - "icon": "temaki-meat", + "icon": "fas-jar", "geometry": [ "point", "area" ], "terms": [ "deli", - "delicatessen", - "lunch", - "meat", - "sandwich" + "delicatessen" ], "tags": { "shop": "deli" }, - "name": "Specialty Food Store", + "name": "Delicatessen", "aliases": [ + "Specialty Food Store", "Gourmet Food Store", "Fine Food Store", "Gourmet Food Shop" diff --git a/data/presets/shop/hairdresser.json b/data/presets/shop/hairdresser.json index f4c7c1a03..d1e4d92eb 100644 --- a/data/presets/shop/hairdresser.json +++ b/data/presets/shop/hairdresser.json @@ -12,5 +12,8 @@ "tags": { "shop": "hairdresser" }, - "name": "Hairdresser" + "name": "Hairdresser", + "aliases": [ + "Hair Salon" + ] } From 4938e8e127961bf3bf6c76691698a198918b700e Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 2 Jun 2022 01:16:41 +0200 Subject: [PATCH 09/11] apply review suggestions --- data/presets/shop/country_store.json | 4 ++-- data/presets/shop/hairdresser.json | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/data/presets/shop/country_store.json b/data/presets/shop/country_store.json index 55050532a..ce4bb8464 100644 --- a/data/presets/shop/country_store.json +++ b/data/presets/shop/country_store.json @@ -7,8 +7,8 @@ "tags": { "shop": "country_store" }, - "name": "Country Store", + "name": "Rural Supplies Store", "aliases": [ - "Rural Supplies Store" + "Country Store" ] } diff --git a/data/presets/shop/hairdresser.json b/data/presets/shop/hairdresser.json index d1e4d92eb..ba4d3b226 100644 --- a/data/presets/shop/hairdresser.json +++ b/data/presets/shop/hairdresser.json @@ -5,15 +5,14 @@ "area" ], "terms": [ - "barber", - "beard", - "salon" + "beard" ], "tags": { "shop": "hairdresser" }, "name": "Hairdresser", "aliases": [ - "Hair Salon" + "Hair Salon", + "Barber Shop" ] } From c12595e055f8efb7251f329a4907d217effe30c9 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 8 Aug 2022 00:21:55 +0200 Subject: [PATCH 10/11] add butchery alias --- data/presets/shop/butcher.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json index cd52e4cfc..98ca0bf55 100644 --- a/data/presets/shop/butcher.json +++ b/data/presets/shop/butcher.json @@ -17,6 +17,7 @@ "name": "Butcher", "aliases": [ "Butcher Shop", - "Pork Store" + "Pork Store", + "Butchery" ] } From bb966a33108f4a7aa38a08a3b54c9f2596fa0ca7 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 8 Aug 2022 00:23:06 +0200 Subject: [PATCH 11/11] remove "delicatessen" from terms because it is already the name --- data/presets/shop/deli.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index 29faec948..a10de92d3 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -5,8 +5,7 @@ "area" ], "terms": [ - "deli", - "delicatessen" + "deli" ], "tags": { "shop": "deli"