diff --git a/data/presets/presets.json b/data/presets/presets.json index 7138a55fd..16ad8cf3c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -185,7 +185,7 @@ "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"}, "amenity/shelter/picnic_shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"}, "amenity/shelter/public_transport": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"}, - "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "fee", "supervised", "building_area", "access_simple", "wheelchair"], "moreFields": ["operator", "gender", "payment_multi_fee"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"}, + "amenity/shower": {"icon": "fas-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "operator", "gender"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"}, "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["lit", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"}, "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"}, "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["opening_hours", "wheelchair", "internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json index 281171fd4..ca7ac26df 100644 --- a/data/presets/presets/amenity/shower.json +++ b/data/presets/presets/amenity/shower.json @@ -1,17 +1,18 @@ { - "icon": "temaki-shower", + "icon": "fas-shower", "fields": [ "opening_hours", + "access_simple", "fee", + "payment_multi_fee", "supervised", "building_area", - "access_simple", "wheelchair" ], "moreFields": [ + "address", "operator", - "gender", - "payment_multi_fee" + "gender" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index 82c27cd8c..068d9b64f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -183,7 +183,7 @@ {"key": "shelter_type", "value": "lean_to", "description": "🄿 Lean-To", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"}, {"key": "shelter_type", "value": "picnic_shelter", "description": "🄿 Picnic Shelter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"}, {"key": "shelter_type", "value": "public_transport", "description": "🄿 Transit Shelter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"}, - {"key": "amenity", "value": "shower", "description": "🄿 Shower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/shower.svg?sanitize=true"}, + {"key": "amenity", "value": "shower", "description": "🄿 Shower", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-shower.svg?sanitize=true"}, {"key": "amenity", "value": "smoking_area", "description": "🄿 Smoking Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-smoking.svg?sanitize=true"}, {"key": "amenity", "value": "social_centre", "description": "🄿 Social Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-handshake.svg?sanitize=true"}, {"key": "amenity", "value": "social_facility", "description": "🄿 Social Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/social_facility.svg?sanitize=true"}, diff --git a/svg/fontawesome/fas-shower.svg b/svg/fontawesome/fas-shower.svg new file mode 100644 index 000000000..bb8841a14 --- /dev/null +++ b/svg/fontawesome/fas-shower.svg @@ -0,0 +1 @@ + \ No newline at end of file