From 63b602360157819c408443dc041d3bdd9ffab1db Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 18 Apr 2019 13:23:45 -0700 Subject: [PATCH] Update icons for Marina and Drinking Water Shop --- data/presets.yaml | 2 +- data/presets/presets.json | 6 +++--- data/presets/presets/leisure/marina.json | 2 +- data/presets/presets/shop/houseware.json | 3 ++- data/presets/presets/shop/water.json | 2 +- data/taginfo.json | 4 ++-- dist/locales/en.json | 2 +- svg/the-noun-project/2009223.svg | 1 + svg/the-noun-project/2009234.svg | 1 + 9 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 svg/the-noun-project/2009223.svg create mode 100644 svg/the-noun-project/2009234.svg diff --git a/data/presets.yaml b/data/presets.yaml index d11019be5..8f8204770 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6684,7 +6684,7 @@ en: shop/houseware: # shop=houseware name: Houseware Store - # 'terms: home,household' + # 'terms: home,household,kitchenware' terms: '' shop/hunting: # shop=hunting diff --git a/data/presets/presets.json b/data/presets/presets.json index fc4f1a11e..1893bbfca 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -596,7 +596,7 @@ "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "internet_access"], "moreFields": ["payment_multi", "internet_access/fee", "internet_access/ssid", "smoking", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"}, "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"}, "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"}, - "leisure/marina": {"icon": "maki-harbor", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"}, + "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"}, "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"}, "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "website", "phone", "email", "fax"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"}, "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"}, @@ -977,7 +977,7 @@ "shop/hearing_aids": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"}, "shop/herbalist": {"icon": "fas-leaf", "geometry": ["point", "area"], "tags": {"shop": "herbalist"}, "name": "Herbalist"}, "shop/hifi": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["audio", "hi-fi", "high fidelity", "stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"}, - "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household"], "tags": {"shop": "houseware"}, "name": "Houseware Store"}, + "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household", "kitchenware"], "tags": {"shop": "houseware"}, "name": "Houseware Store"}, "shop/hunting": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"}, "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"}, "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"}, @@ -1038,7 +1038,7 @@ "shop/video": {"icon": "temaki-movie_rental", "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"}, "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"}, "shop/water_sports": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"}, - "shop/water": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"}, + "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"}, "shop/weapons": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"}, "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"}, "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"}, diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json index accd3f4c6..cac53f95e 100644 --- a/data/presets/presets/leisure/marina.json +++ b/data/presets/presets/leisure/marina.json @@ -1,5 +1,5 @@ { - "icon": "maki-harbor", + "icon": "tnp-2009223", "fields": [ "name", "operator", diff --git a/data/presets/presets/shop/houseware.json b/data/presets/presets/shop/houseware.json index 1f92cc1ab..487153cd7 100644 --- a/data/presets/presets/shop/houseware.json +++ b/data/presets/presets/shop/houseware.json @@ -6,7 +6,8 @@ ], "terms": [ "home", - "household" + "household", + "kitchenware" ], "tags": { "shop": "houseware" diff --git a/data/presets/presets/shop/water.json b/data/presets/presets/shop/water.json index 68bc8a0b6..3bbeb8293 100644 --- a/data/presets/presets/shop/water.json +++ b/data/presets/presets/shop/water.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "tnp-2009234", "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index fb7aa2194..772750e48 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -576,7 +576,7 @@ {"key": "leisure", "value": "hackerspace", "description": "🄿 Hackerspace", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-code.svg?sanitize=true"}, {"key": "leisure", "value": "horse_riding", "description": "🄿 Horseback Riding Facility, 🄵 Horseback Riding", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"}, {"key": "leisure", "value": "ice_rink", "description": "🄿 Ice Rink", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skating.svg?sanitize=true"}, - {"key": "leisure", "value": "marina", "description": "🄿 Marina", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"}, + {"key": "leisure", "value": "marina", "description": "🄿 Marina", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/the-noun-project/2009223.svg?sanitize=true"}, {"key": "leisure", "value": "miniature_golf", "description": "🄿 Miniature Golf", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "leisure", "value": "nature_reserve", "description": "🄿 Nature Reserve", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"}, {"key": "leisure", "value": "outdoor_seating", "description": "🄿 Outdoor Seating Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/picnic-site-15.svg?sanitize=true"}, @@ -981,7 +981,7 @@ {"key": "shop", "value": "video", "description": "🄿 Video Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/movie_rental.svg?sanitize=true"}, {"key": "shop", "value": "watches", "description": "🄿 Watches Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/watch-15.svg?sanitize=true"}, {"key": "shop", "value": "water_sports", "description": "🄿 Watersport/Swim Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, - {"key": "shop", "value": "water", "description": "🄿 Drinking Water Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, + {"key": "shop", "value": "water", "description": "🄿 Drinking Water Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/the-noun-project/2009234.svg?sanitize=true"}, {"key": "shop", "value": "weapons", "description": "🄿 Weapon Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"}, {"key": "shop", "value": "wholesale", "description": "🄿 Wholesale Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/warehouse-15.svg?sanitize=true"}, {"key": "shop", "value": "window_blind", "description": "🄿 Window Blind Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/window.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d1e0151f1..74d421ab8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7996,7 +7996,7 @@ }, "shop/houseware": { "name": "Houseware Store", - "terms": "home,household" + "terms": "home,household,kitchenware" }, "shop/hunting": { "name": "Hunting Shop", diff --git a/svg/the-noun-project/2009223.svg b/svg/the-noun-project/2009223.svg new file mode 100644 index 000000000..a4e014433 --- /dev/null +++ b/svg/the-noun-project/2009223.svg @@ -0,0 +1 @@ +Asset 579 \ No newline at end of file diff --git a/svg/the-noun-project/2009234.svg b/svg/the-noun-project/2009234.svg new file mode 100644 index 000000000..628096f5e --- /dev/null +++ b/svg/the-noun-project/2009234.svg @@ -0,0 +1 @@ +Asset 464 \ No newline at end of file