From 66d5b5d0d1c69beb2b714cfc61482dcb038615f1 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 23 Dec 2019 11:05:38 -0500 Subject: [PATCH] Add new presets for nsi 3.5.0 - craft/cleaning.json - shop/camera.json - shop/flooring.json - shop/pottery.json - shop/tool_hire.json --- CHANGELOG.md | 3 ++- data/presets.yaml | 31 +++++++++++++++++++++--- data/presets/presets.json | 14 +++++++++-- data/presets/presets/craft/cleaning.json | 11 +++++++++ data/presets/presets/craft/pottery.json | 7 ++++-- data/presets/presets/shop/camera.json | 17 +++++++++++++ data/presets/presets/shop/flooring.json | 14 +++++++++++ data/presets/presets/shop/photo.json | 4 ++- data/presets/presets/shop/pottery.json | 16 ++++++++++++ data/presets/presets/shop/tool_hire.json | 11 +++++++++ data/taginfo.json | 7 +++++- dist/locales/en.json | 26 +++++++++++++++++--- 12 files changed, 147 insertions(+), 14 deletions(-) create mode 100644 data/presets/presets/craft/cleaning.json create mode 100644 data/presets/presets/shop/camera.json create mode 100644 data/presets/presets/shop/flooring.json create mode 100644 data/presets/presets/shop/pottery.json create mode 100644 data/presets/presets/shop/tool_hire.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 220e63570..29ae2740f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, --> # 2.17.0 -##### Planned: 2019-Dec-20 +##### 2019-Dec-23 #### :newspaper: News * We've launched the [iD Blog](https://ideditor.blog) providing news and insights into the project from its maintainers and contributors ([#7045]) @@ -197,6 +197,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, [@mbrickn]: https://github.com/mbrickn #### :rocket: Presets +* Add Cleaning Service, Camera Equipment, Flooring Supply, Pottery Store, Tool Rental presets * Add Notice Board, Poster Box, and Advertising Totem presets ([#6965], thanks [@hikemaniac]) * Add Kiddie Ride, Log Flume, and Swing Carousel presets ([#7039], thanks [@hikemaniac]) * Add Spice Shop preset ([#7031], thanks [@scaidermern]) diff --git a/data/presets.yaml b/data/presets.yaml index 743d4652f..44436bca7 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4396,6 +4396,10 @@ en: # craft=chimney_sweeper name: Chimney Sweeper terms: '' + craft/cleaning: + # craft=cleaning + name: Cleaning Service + terms: '' craft/clockmaker: # craft=clockmaker name: Clockmaker @@ -4495,9 +4499,9 @@ en: terms: '' craft/pottery: # craft=pottery - name: Pottery - # 'terms: ceramic' - terms: '' + name: Pottery Maker + # 'terms: ceramic,kiln,pot,vase' + terms: '' craft/rigger: # craft=rigger name: Rigger @@ -7388,6 +7392,11 @@ en: name: Butcher # 'terms: chicken,beef,lamb,meat,pork' terms: '' + shop/camera: + # shop=camera + name: Camera Equipment Store + # 'terms: camera,film,lens,photo' + terms: '' shop/candles: # shop=candles name: Candle Shop @@ -7576,6 +7585,11 @@ en: shop/fishmonger: # shop=fishmonger name: Fishmonger + shop/flooring: + # shop=flooring + name: Flooring Supply Shop + # 'terms: tile' + terms: '' shop/florist: # shop=florist name: Florist @@ -7839,8 +7853,13 @@ en: shop/photo: # shop=photo name: Photography Store - # 'terms: camera,film' + # 'terms: camera,film,lens,photo' terms: '' + shop/pottery: + # shop=pottery + name: Pottery Store + # 'terms: ceramic,pot,vase' + terms: '' shop/printer_ink: # shop=printer_ink name: Printer Ink Store @@ -7957,6 +7976,10 @@ en: name: Tobacco Shop # 'terms: cigarettes,cigars' terms: '' + shop/tool_hire: + # shop=tool_hire + name: Tool Rental + terms: '' shop/toys: # shop=toys name: Toy Store diff --git a/data/presets/presets.json b/data/presets/presets.json index 8877aa986..e4af98196 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -395,6 +395,7 @@ "craft/carpet_layer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "carpet_layer"}, "name": "Carpet Layer"}, "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"}, "craft/chimney_sweeper": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"}, + "craft/cleaning": {"icon": "temaki-vacuum", "geometry": ["point", "area"], "tags": {"craft": "cleaning"}, "name": "Cleaning Service"}, "craft/clockmaker": {"icon": "temaki-clock", "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"}, "craft/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"}, "craft/distillery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"}, @@ -416,7 +417,7 @@ "craft/photographic_laboratory": {"icon": "fas-film", "geometry": ["point", "area"], "terms": ["film"], "tags": {"craft": "photographic_laboratory"}, "name": "Photographic Laboratory"}, "craft/plasterer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "plasterer"}, "name": "Plasterer"}, "craft/plumber": {"icon": "temaki-plumber", "geometry": ["point", "area"], "terms": ["pipe"], "tags": {"craft": "plumber"}, "name": "Plumber"}, - "craft/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic"], "tags": {"craft": "pottery"}, "name": "Pottery"}, + "craft/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic", "kiln", "pot", "vase"], "tags": {"craft": "pottery"}, "name": "Pottery Maker"}, "craft/rigger": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "rigger"}, "name": "Rigger"}, "craft/roofer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "roofer"}, "name": "Roofer"}, "craft/saddler": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "saddler"}, "name": "Saddler"}, @@ -1037,6 +1038,7 @@ "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"}, "shop/brewing_supplies": {"icon": "temaki-storage_fermenter", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"}, "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"}, + "shop/camera": {"icon": "fas-camera-retro", "geometry": ["point", "area"], "terms": ["camera", "film", "lens", "photo"], "tags": {"shop": "camera"}, "name": "Camera Equipment Store"}, "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"}, "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"}, "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"}, @@ -1075,6 +1077,7 @@ "shop/fashion_accessories": {"icon": "temaki-fashion_accessories", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"}, "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"}, "shop/fishing": {"icon": "temaki-ice_fishing", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"}, + "shop/flooring": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "flooring"}, "terms": ["tile"], "name": "Flooring Supply Shop"}, "shop/florist": {"icon": "maki-florist", "geometry": ["point", "area"], "terms": ["flower"], "tags": {"shop": "florist"}, "name": "Florist"}, "shop/frame": {"icon": "fas-vector-square", "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "paint*", "photo*", "frame"], "name": "Framing Shop"}, "shop/frozen_food": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "frozen_food"}, "name": "Frozen Food"}, @@ -1130,7 +1133,8 @@ "shop/perfumery": {"icon": "temaki-perfume", "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "terms": ["cologne", "fragrance", "purfume"], "name": "Perfume Store"}, "shop/pet_grooming": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["cat", "dog"], "tags": {"shop": "pet_grooming"}, "name": "Pet Grooming Store"}, "shop/pet": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["animal", "cat", "dog", "fish", "kitten", "puppy", "reptile"], "tags": {"shop": "pet"}, "name": "Pet Store"}, - "shop/photo": {"icon": "fas-camera-retro", "geometry": ["point", "area"], "terms": ["camera", "film"], "tags": {"shop": "photo"}, "name": "Photography Store"}, + "shop/photo": {"icon": "fas-camera-retro", "geometry": ["point", "area"], "terms": ["camera", "film", "lens", "photo"], "tags": {"shop": "photo"}, "name": "Photography Store"}, + "shop/pottery": {"icon": "temaki-vase", "geometry": ["point", "area"], "terms": ["ceramic", "pot", "vase"], "tags": {"shop": "pottery"}, "name": "Pottery Store"}, "shop/printer_ink": {"icon": "fas-print", "geometry": ["point", "area"], "terms": ["copier ink", "fax ink", "ink cartridges", "toner"], "tags": {"shop": "printer_ink"}, "name": "Printer Ink Store"}, "shop/psychic": {"icon": "temaki-psychic", "geometry": ["point", "area"], "tags": {"shop": "psychic"}, "terms": ["astrology", "crystal ball", "divination", "fortune teller", "seer", "spirit"], "name": "Psychic"}, "shop/pyrotechnics": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "pyrotechnics"}, "terms": ["fireworks"], "name": "Fireworks Store"}, @@ -1155,6 +1159,7 @@ "shop/ticket": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "ticket"}, "terms": ["box office"], "name": "Ticket Seller"}, "shop/tiles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tiles"}, "name": "Tile Shop"}, "shop/tobacco": {"icon": "temaki-pipe", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"}, + "shop/tool_hire": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "tool_hire"}, "name": "Tool Rental"}, "shop/toys": {"icon": "fas-rocket", "geometry": ["point", "area"], "tags": {"shop": "toys"}, "terms": ["games"], "name": "Toy Store"}, "shop/trade": {"icon": "temaki-tools", "fields": ["name", "trade", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "trade"}, "name": "Trade Shop"}, "shop/travel_agency": {"icon": "fas-suitcase", "geometry": ["point", "area"], "tags": {"shop": "travel_agency"}, "terms": ["cruises", "flights", "hotels", "tickets", "travel packages"], "name": "Travel Agency"}, @@ -3350,6 +3355,7 @@ "amenity/vending_machine/ポッカサッポロ": {"name": "ポッカサッポロ", "icon": "temaki-vending_machine", "imageURL": "https://pbs.twimg.com/profile_images/937822527543377920/j8-XeRV8_bigger.jpg", "geometry": ["point", "vertex"], "tags": {"brand:wikidata": "Q7208665", "amenity": "vending_machine"}, "addTags": {"amenity": "vending_machine", "brand": "ポッカサッポロ", "brand:en": "Pokka Sapporo", "brand:ja": "ポッカサッポロ", "brand:wikidata": "Q7208665", "brand:wikipedia": "ja:ポッカサッポロフード&ビバレッジ", "name": "ポッカサッポロ", "name:en": "Pokka Sapporo", "name:ja": "ポッカサッポロ", "vending": "water;food"}, "countryCodes": ["jp"], "terms": ["pokka sapporo"], "matchScore": 2, "suggestion": true}, "amenity/veterinary/Banfield Pet Hospital": {"name": "Banfield Pet Hospital", "icon": "temaki-veterinary_care", "imageURL": "https://graph.facebook.com/BanfieldPetHospital/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2882416", "amenity": "veterinary"}, "addTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "amenity/veterinary/VCA Animal Hospital": {"name": "VCA Animal Hospital", "icon": "temaki-veterinary_care", "imageURL": "https://graph.facebook.com/VCAAnimalHospitals/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7906620", "amenity": "veterinary"}, "addTags": {"amenity": "veterinary", "brand": "VCA Animal Hospital", "brand:wikidata": "Q7906620", "brand:wikipedia": "en:VCA Animal Hospitals", "name": "VCA Animal Hospital"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true}, + "craft/cleaning/Molly Maid": {"name": "Molly Maid", "icon": "temaki-vacuum", "imageURL": "https://graph.facebook.com/MollyMaid/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6896624", "craft": "cleaning"}, "addTags": {"brand": "Molly Maid", "brand:wikidata": "Q6896624", "brand:wikipedia": "en:Molly Maid", "craft": "cleaning", "name": "Molly Maid"}, "countryCodes": ["ca", "gb", "jp", "pt", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "craft/plumber/Mr. Rooter": {"name": "Mr. Rooter", "icon": "temaki-plumber", "imageURL": "https://pbs.twimg.com/profile_images/746187320223633408/_TPED5cc_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6929145", "craft": "plumber"}, "addTags": {"alt_name": "Mister Rooter", "brand": "Mr. Rooter", "brand:wikidata": "Q6929145", "brand:wikipedia": "en:Mr. Rooter", "craft": "plumber", "name": "Mr. Rooter", "official_name": "Mr. Rooter Plumbing"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "craft/signmaker/Fastsigns": {"name": "Fastsigns", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/FASTSIGNS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5437127", "craft": "signmaker"}, "addTags": {"brand": "Fastsigns", "brand:wikidata": "Q5437127", "brand:wikipedia": "en:Fastsigns", "craft": "signmaker", "name": "Fastsigns"}, "countryCodes": ["ae", "ca", "cl", "gb", "ky", "mx", "sa", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "craft/window_construction/K par K": {"name": "K par K", "icon": "temaki-window", "imageURL": "https://graph.facebook.com/KparKFrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3191596", "craft": "window_construction"}, "addTags": {"brand": "K par K", "brand:wikidata": "Q3191596", "brand:wikipedia": "fr:K par K", "craft": "window_construction", "name": "K par K"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, @@ -3695,6 +3701,7 @@ "shop/butcher/Великолукский мясокомбинат": {"name": "Великолукский мясокомбинат", "icon": "fas-bacon", "imageURL": "https://graph.facebook.com/vlmkspb/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18401767", "shop": "butcher"}, "addTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/butcher/Родинна ковбаска": {"name": "Родинна ковбаска", "icon": "fas-bacon", "imageURL": "https://graph.facebook.com/rodunnakovbaska/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q30969660", "shop": "butcher"}, "addTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "countryCodes": ["ua"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/butcher/肉のハナマサ": {"name": "肉のハナマサ", "icon": "fas-bacon", "imageURL": "https://graph.facebook.com/hanamasaresto/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11326564", "shop": "butcher"}, "addTags": {"brand": "ハナマサ", "brand:en": "Hanamasa", "brand:ja": "ハナマサ", "brand:wikidata": "Q11326564", "brand:wikipedia": "ja:ハナマサ", "butcher": "beef", "name": "肉のハナマサ", "name:en": "Hanamasa Meat", "name:ja": "肉のハナマサ", "shop": "butcher"}, "countryCodes": ["jp"], "terms": ["ハナマサ"], "matchScore": 2, "suggestion": true}, + "shop/camera/Jessops": {"name": "Jessops", "icon": "fas-camera-retro", "imageURL": "https://graph.facebook.com/jessops/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3191701", "shop": "camera"}, "addTags": {"brand": "Jessops", "brand:wikidata": "Q3191701", "brand:wikipedia": "en:Jessops", "name": "Jessops", "shop": "camera"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/candles/Yankee Candle": {"name": "Yankee Candle", "icon": "fas-burn", "imageURL": "https://graph.facebook.com/Yankeecandle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8048733", "shop": "candles"}, "addTags": {"brand": "Yankee Candle", "brand:wikidata": "Q8048733", "brand:wikipedia": "en:Yankee Candle", "name": "Yankee Candle", "shop": "candles"}, "countryCodes": ["ca", "gb", "us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/car_parts/Advance Auto Parts": {"name": "Advance Auto Parts", "icon": "fas-car-battery", "imageURL": "https://graph.facebook.com/advanceautoparts/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4686051", "shop": "car_parts"}, "addTags": {"brand": "Advance Auto Parts", "brand:wikidata": "Q4686051", "brand:wikipedia": "en:Advance Auto Parts", "name": "Advance Auto Parts", "shop": "car_parts"}, "countryCodes": ["ca", "us", "vi"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/car_parts/Auto Plus": {"name": "Auto Plus", "icon": "fas-car-battery", "imageURL": "https://graph.facebook.com/AutoPlusUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65121114", "shop": "car_parts"}, "addTags": {"brand": "Auto Plus", "brand:wikidata": "Q65121114", "name": "Auto Plus", "official_name": "Auto Plus Auto Parts", "shop": "car_parts"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, @@ -4655,6 +4662,7 @@ "shop/fashion_accessories/Claire's": {"name": "Claire's", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/claires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2974996", "shop": "fashion_accessories"}, "addTags": {"brand": "Claire's", "brand:wikidata": "Q2974996", "brand:wikipedia": "en:Claire's", "name": "Claire's", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true}, "shop/fashion_accessories/Radley London": {"name": "Radley London", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/RadleyUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7281436", "shop": "fashion_accessories"}, "addTags": {"brand": "Radley London", "brand:wikidata": "Q7281436", "name": "Radley London", "shop": "fashion_accessories", "short_name": "Radley"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/fashion_accessories/Van Cleef & Arpels": {"name": "Van Cleef & Arpels", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/vancleef.arpels/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2708181", "shop": "fashion_accessories"}, "addTags": {"brand": "Van Cleef & Arpels", "brand:wikidata": "Q2708181", "brand:wikipedia": "en:Van Cleef & Arpels", "name": "Van Cleef & Arpels", "shop": "fashion_accessories"}, "terms": ["van cleef & arples"], "matchScore": 2, "suggestion": true}, + "shop/flooring/Floor & Decor": {"name": "Floor & Decor", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/flooranddecor/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q56280964", "shop": "flooring"}, "addTags": {"brand": "Floor & Decor", "brand:wikidata": "Q56280964", "brand:wikipedia": "en:Floor & Decor", "name": "Floor & Decor", "shop": "flooring"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/florist/Blume 2000": {"name": "Blume 2000", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/Blume2000.de/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q886166", "shop": "florist"}, "addTags": {"brand": "Blume 2000", "brand:wikidata": "Q886166", "brand:wikipedia": "de:Blume 2000", "name": "Blume 2000", "shop": "florist"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/florist/Blumen Risse": {"name": "Blumen Risse", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/BlumenRisse/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q886177", "shop": "florist"}, "addTags": {"brand": "Blumen Risse", "brand:wikidata": "Q886177", "brand:wikipedia": "de:Blumen Risse", "name": "Blumen Risse", "shop": "florist"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/florist/Holland Blumen Mark": {"name": "Holland Blumen Mark", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/HollandBlumenMark/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1624739", "shop": "florist"}, "addTags": {"brand": "Holland Blumen Mark", "brand:wikidata": "Q1624739", "brand:wikipedia": "de:Holland Blumen Mark", "name": "Holland Blumen Mark", "shop": "florist"}, "countryCodes": ["at"], "terms": ["holland blumen"], "matchScore": 2, "suggestion": true}, @@ -5102,6 +5110,7 @@ "shop/photo/Kodak Express": {"name": "Kodak Express", "icon": "fas-camera-retro", "imageURL": "https://graph.facebook.com/kodakexpress/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6425126", "shop": "photo"}, "addTags": {"brand": "Kodak Express", "brand:wikidata": "Q6425126", "brand:wikipedia": "en:Kodak Express", "name": "Kodak Express", "shop": "photo"}, "terms": ["kodak"], "matchScore": 2, "suggestion": true}, "shop/photo/Max Spielmann": {"name": "Max Spielmann", "icon": "fas-camera-retro", "imageURL": "https://graph.facebook.com/MaxPhotoCentres/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q76221051", "shop": "photo"}, "addTags": {"brand": "Max Spielmann", "brand:wikidata": "Q76221051", "name": "Max Spielmann", "shop": "photo"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/photo/カメラのキタムラ": {"name": "カメラのキタムラ", "icon": "fas-camera-retro", "imageURL": "https://graph.facebook.com/kitamura.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11294821", "shop": "photo"}, "addTags": {"brand": "カメラのキタムラ", "brand:en": "Kitamura Camera", "brand:ja": "カメラのキタムラ", "brand:wikidata": "Q11294821", "brand:wikipedia": "ja:カメラのキタムラ", "name": "カメラのキタムラ", "name:en": "Kitamura Camera", "name:ja": "カメラのキタムラ", "shop": "photo"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/pottery/Sargadelos": {"name": "Sargadelos", "icon": "temaki-vase", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12390201", "shop": "pottery"}, "addTags": {"brand": "Sargadelos", "brand:wikidata": "Q12390201", "brand:wikipedia": "gl:Grupo Sargadelos", "name": "Sargadelos", "shop": "pottery"}, "terms": [], "matchScore": 2, "suggestion": true}, "shop/printer_ink/Cartridge World": {"name": "Cartridge World", "icon": "fas-print", "imageURL": "https://graph.facebook.com/CartridgeWorldNewsUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5047439", "shop": "printer_ink"}, "addTags": {"brand": "Cartridge World", "brand:wikidata": "Q5047439", "brand:wikipedia": "en:Cartridge World", "name": "Cartridge World", "shop": "printer_ink"}, "terms": [], "matchScore": 2, "suggestion": true}, "shop/rental/U-Haul": {"name": "U-Haul", "icon": "fas-dolly", "imageURL": "https://graph.facebook.com/uhaul/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7862902", "shop": "rental"}, "addTags": {"brand": "U-Haul", "brand:wikidata": "Q7862902", "brand:wikipedia": "en:U-Haul", "name": "U-Haul", "shop": "rental"}, "countryCodes": ["ca", "us"], "terms": ["uhaul neighborhood dealer"], "matchScore": 2, "suggestion": true}, "shop/second_hand/Savers": {"name": "Savers", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/savers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7428188", "shop": "second_hand"}, "addTags": {"brand": "Savers", "brand:wikidata": "Q7428188", "brand:wikipedia": "en:Savers", "name": "Savers", "shop": "second_hand"}, "countryCodes": ["au", "ca", "us"], "terms": [], "matchScore": 2, "suggestion": true}, @@ -5726,6 +5735,7 @@ "shop/ticket/Guichet Transilien": {"name": "Guichet Transilien", "icon": "fas-ticket-alt", "imageURL": "https://pbs.twimg.com/profile_images/1187367754988429313/HmyF6sUy_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q389554", "shop": "ticket"}, "addTags": {"brand": "Guichet Transilien", "brand:wikidata": "Q389554", "brand:wikipedia": "fr:Transilien", "name": "Guichet Transilien", "shop": "ticket"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/tiles/Topps Tiles": {"name": "Topps Tiles", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/toppstiles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17026595", "shop": "tiles"}, "addTags": {"brand": "Topps Tiles", "brand:wikidata": "Q17026595", "brand:wikipedia": "en:Topps Tiles", "name": "Topps Tiles", "shop": "tiles"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/tobacco/Nemzeti Dohánybolt": {"name": "Nemzeti Dohánybolt", "icon": "temaki-pipe", "imageURL": "https://graph.facebook.com/195460840603881/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q20639040", "shop": "tobacco"}, "addTags": {"brand": "Nemzeti Dohánybolt", "brand:wikidata": "Q20639040", "brand:wikipedia": "en:Dohánybolt", "name": "Nemzeti Dohánybolt", "shop": "tobacco"}, "countryCodes": ["hu"], "terms": ["dohánybolt"], "matchScore": 2, "suggestion": true}, + "shop/tool_hire/HSS Hire": {"name": "HSS Hire", "icon": "temaki-tools", "imageURL": "https://pbs.twimg.com/profile_images/1128980411504373760/yYZco9IU_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5636000", "shop": "tool_hire"}, "addTags": {"brand": "HSS Hire", "brand:wikidata": "Q5636000", "brand:wikipedia": "en:HSS Hire", "name": "HSS Hire", "shop": "tool_hire"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/toys/Build-A-Bear Workshop": {"name": "Build-A-Bear Workshop", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/Buildabear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1002992", "shop": "toys"}, "addTags": {"brand": "Build-A-Bear Workshop", "brand:wikidata": "Q1002992", "brand:wikipedia": "en:Build-A-Bear Workshop", "name": "Build-A-Bear Workshop", "shop": "toys"}, "countryCodes": ["ca", "gb", "us"], "terms": ["build a bear"], "matchScore": 2, "suggestion": true}, "shop/toys/Dráčik": {"name": "Dráčik", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/2185187834828492/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57653669", "shop": "toys"}, "addTags": {"brand": "Dráčik", "brand:wikidata": "Q57653669", "name": "Dráčik", "shop": "toys"}, "countryCodes": ["cz", "sk"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/toys/Early Learning Centre": {"name": "Early Learning Centre", "icon": "fas-rocket", "imageURL": "https://pbs.twimg.com/profile_images/1169193556151537664/rPFaBs5D_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5326681", "shop": "toys"}, "addTags": {"alt_name": "ELC", "brand": "Early Learning Centre", "brand:wikidata": "Q5326681", "brand:wikipedia": "en:Early Learning Centre", "name": "Early Learning Centre", "shop": "toys"}, "terms": ["early learning center"], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/craft/cleaning.json b/data/presets/presets/craft/cleaning.json new file mode 100644 index 000000000..826a8143b --- /dev/null +++ b/data/presets/presets/craft/cleaning.json @@ -0,0 +1,11 @@ +{ + "icon": "temaki-vacuum", + "geometry": [ + "point", + "area" + ], + "tags": { + "craft": "cleaning" + }, + "name": "Cleaning Service" +} diff --git a/data/presets/presets/craft/pottery.json b/data/presets/presets/craft/pottery.json index e93ec6a5f..bf4787e69 100644 --- a/data/presets/presets/craft/pottery.json +++ b/data/presets/presets/craft/pottery.json @@ -5,10 +5,13 @@ "area" ], "terms": [ - "ceramic" + "ceramic", + "kiln", + "pot", + "vase" ], "tags": { "craft": "pottery" }, - "name": "Pottery" + "name": "Pottery Maker" } diff --git a/data/presets/presets/shop/camera.json b/data/presets/presets/shop/camera.json new file mode 100644 index 000000000..3e368f796 --- /dev/null +++ b/data/presets/presets/shop/camera.json @@ -0,0 +1,17 @@ +{ + "icon": "fas-camera-retro", + "geometry": [ + "point", + "area" + ], + "terms": [ + "camera", + "film", + "lens", + "photo" + ], + "tags": { + "shop": "camera" + }, + "name": "Camera Equipment Store" +} diff --git a/data/presets/presets/shop/flooring.json b/data/presets/presets/shop/flooring.json new file mode 100644 index 000000000..52ac5052f --- /dev/null +++ b/data/presets/presets/shop/flooring.json @@ -0,0 +1,14 @@ +{ + "icon": "temaki-tools", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "flooring" + }, + "terms": [ + "tile" + ], + "name": "Flooring Supply Shop" +} diff --git a/data/presets/presets/shop/photo.json b/data/presets/presets/shop/photo.json index 99b86e396..60bb2ff9c 100644 --- a/data/presets/presets/shop/photo.json +++ b/data/presets/presets/shop/photo.json @@ -6,7 +6,9 @@ ], "terms": [ "camera", - "film" + "film", + "lens", + "photo" ], "tags": { "shop": "photo" diff --git a/data/presets/presets/shop/pottery.json b/data/presets/presets/shop/pottery.json new file mode 100644 index 000000000..5cbb1af17 --- /dev/null +++ b/data/presets/presets/shop/pottery.json @@ -0,0 +1,16 @@ +{ + "icon": "temaki-vase", + "geometry": [ + "point", + "area" + ], + "terms": [ + "ceramic", + "pot", + "vase" + ], + "tags": { + "shop": "pottery" + }, + "name": "Pottery Store" +} diff --git a/data/presets/presets/shop/tool_hire.json b/data/presets/presets/shop/tool_hire.json new file mode 100644 index 000000000..60f0b36c8 --- /dev/null +++ b/data/presets/presets/shop/tool_hire.json @@ -0,0 +1,11 @@ +{ + "icon": "temaki-tools", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "tool_hire" + }, + "name": "Tool Rental" +} diff --git a/data/taginfo.json b/data/taginfo.json index 1e7601221..a9aafa0d6 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -390,6 +390,7 @@ {"key": "craft", "value": "carpet_layer", "description": "🄿 Carpet Layer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "caterer", "description": "🄿 Caterer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "craft", "value": "chimney_sweeper", "description": "🄿 Chimney Sweeper", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/chimney.svg"}, + {"key": "craft", "value": "cleaning", "description": "🄿 Cleaning Service", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vacuum.svg"}, {"key": "craft", "value": "clockmaker", "description": "🄿 Clockmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clock.svg"}, {"key": "craft", "value": "confectionery", "description": "🄿 Candy Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/confectionery-15.svg"}, {"key": "craft", "value": "distillery", "description": "🄿 Distillery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"}, @@ -411,7 +412,7 @@ {"key": "craft", "value": "photographic_laboratory", "description": "🄿 Photographic Laboratory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-film.svg"}, {"key": "craft", "value": "plasterer", "description": "🄿 Plasterer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "plumber", "description": "🄿 Plumber", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plumber.svg"}, - {"key": "craft", "value": "pottery", "description": "🄿 Pottery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"}, + {"key": "craft", "value": "pottery", "description": "🄿 Pottery Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"}, {"key": "craft", "value": "rigger", "description": "🄿 Rigger", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "roofer", "description": "🄿 Roofer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "saddler", "description": "🄿 Saddler", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, @@ -981,6 +982,7 @@ {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-book.svg"}, {"key": "shop", "value": "brewing_supplies", "description": "🄿 Brewing Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"}, {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bacon.svg"}, + {"key": "shop", "value": "camera", "description": "🄿 Camera Equipment Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-camera-retro.svg"}, {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-burn.svg"}, {"key": "shop", "value": "cannabis", "description": "🄿 Cannabis Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cannabis.svg"}, {"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"}, @@ -1018,6 +1020,7 @@ {"key": "shop", "value": "fashion_accessories", "description": "🄿 Fashion Accessories Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/fashion_accessories.svg"}, {"key": "shop", "value": "fireplace", "description": "🄿 Fireplace Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "fishing", "description": "🄿 Fishing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ice_fishing.svg"}, + {"key": "shop", "value": "flooring", "description": "🄿 Flooring Supply Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "shop", "value": "florist", "description": "🄿 Florist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/florist-15.svg"}, {"key": "shop", "value": "frame", "description": "🄿 Framing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vector-square.svg"}, {"key": "shop", "value": "frozen_food", "description": "🄿 Frozen Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, @@ -1074,6 +1077,7 @@ {"key": "shop", "value": "pet_grooming", "description": "🄿 Pet Grooming Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"}, {"key": "shop", "value": "pet", "description": "🄿 Pet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"}, {"key": "shop", "value": "photo", "description": "🄿 Photography Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-camera-retro.svg"}, + {"key": "shop", "value": "pottery", "description": "🄿 Pottery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/vase.svg"}, {"key": "shop", "value": "printer_ink", "description": "🄿 Printer Ink Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-print.svg"}, {"key": "shop", "value": "psychic", "description": "🄿 Psychic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/psychic.svg"}, {"key": "shop", "value": "pyrotechnics", "description": "🄿 Fireworks Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, @@ -1098,6 +1102,7 @@ {"key": "shop", "value": "ticket", "description": "🄿 Ticket Seller", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ticket-alt.svg"}, {"key": "shop", "value": "tiles", "description": "🄿 Tile Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "tobacco", "description": "🄿 Tobacco Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pipe.svg"}, + {"key": "shop", "value": "tool_hire", "description": "🄿 Tool Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "shop", "value": "toys", "description": "🄿 Toy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-rocket.svg"}, {"key": "shop", "value": "trade", "description": "🄿 Trade Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "shop", "value": "travel_agency", "description": "🄿 Travel Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-suitcase.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 5510573d7..4ba3b47c8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6351,6 +6351,10 @@ "name": "Chimney Sweeper", "terms": "" }, + "craft/cleaning": { + "name": "Cleaning Service", + "terms": "" + }, "craft/clockmaker": { "name": "Clockmaker", "terms": "" @@ -6436,8 +6440,8 @@ "terms": "pipe" }, "craft/pottery": { - "name": "Pottery", - "terms": "ceramic" + "name": "Pottery Maker", + "terms": "ceramic,kiln,pot,vase" }, "craft/rigger": { "name": "Rigger", @@ -8877,6 +8881,10 @@ "name": "Butcher", "terms": "chicken,beef,lamb,meat,pork" }, + "shop/camera": { + "name": "Camera Equipment Store", + "terms": "camera,film,lens,photo" + }, "shop/candles": { "name": "Candle Shop", "terms": "wax" @@ -9029,6 +9037,10 @@ "name": "Fishing Shop", "terms": "bait,fishing line,flies,fly,lure,reel,rod,tackle" }, + "shop/flooring": { + "name": "Flooring Supply Shop", + "terms": "tile" + }, "shop/florist": { "name": "Florist", "terms": "flower" @@ -9251,7 +9263,11 @@ }, "shop/photo": { "name": "Photography Store", - "terms": "camera,film" + "terms": "camera,film,lens,photo" + }, + "shop/pottery": { + "name": "Pottery Store", + "terms": "ceramic,pot,vase" }, "shop/printer_ink": { "name": "Printer Ink Store", @@ -9349,6 +9365,10 @@ "name": "Tobacco Shop", "terms": "cigarettes,cigars" }, + "shop/tool_hire": { + "name": "Tool Rental", + "terms": "" + }, "shop/toys": { "name": "Toy Store", "terms": "games"