From 8d313677fd351851a4bbf89ba731fd8e2296a2be Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 8 Apr 2019 09:53:01 -0700 Subject: [PATCH] Add leisure=swimming_area preset --- data/presets.yaml | 5 ++++ data/presets/presets.json | 3 ++- .../presets/leisure/swimming_area.json | 26 +++++++++++++++++++ .../presets/leisure/swimming_pool.json | 5 ++-- data/taginfo.json | 1 + dist/locales/en.json | 4 +++ 6 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/leisure/swimming_area.json diff --git a/data/presets.yaml b/data/presets.yaml index a865d8973..a43ba4467 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4997,6 +4997,11 @@ en: # leisure=stadium name: Stadium terms: '' + leisure/swimming_area: + # leisure=swimming_area + name: Natural Swimming Area + # 'terms: dive,water,aquatics' + terms: '' leisure/swimming_pool: # leisure=swimming_pool name: Swimming Pool diff --git a/data/presets/presets.json b/data/presets/presets.json index 00fa8cbdf..988fa130e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -623,7 +623,8 @@ "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"}, "leisure/sports_centre/swimming": {"icon": "maki-swimming", "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"}, "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, - "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["operator", "address"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, + "leisure/swimming_area": {"icon": "maki-swimming", "fields": ["name", "access_simple", "supervised", "fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"}, + "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"}, "leisure/track/cycling": {"icon": "maki-bicycle", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "addTags": {"leisure": "track", "sport": "cycling", "highway": "cycleway"}, "removeTags": {"leisure": "track", "sport": "cycling", "highway": "cycleway"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"}, "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "addTags": {"leisure": "track", "sport": "horse_racing", "highway": "bridleway"}, "removeTags": {"leisure": "track", "sport": "horse_racing", "highway": "bridleway"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"}, diff --git a/data/presets/presets/leisure/swimming_area.json b/data/presets/presets/leisure/swimming_area.json new file mode 100644 index 000000000..f60eb07d6 --- /dev/null +++ b/data/presets/presets/leisure/swimming_area.json @@ -0,0 +1,26 @@ +{ + "icon": "maki-swimming", + "fields": [ + "name", + "access_simple", + "supervised", + "fee", + "lit" + ], + "moreFields": [ + "opening_hours", + "operator" + ], + "geometry": [ + "area" + ], + "terms": [ + "dive", + "water", + "aquatics" + ], + "tags": { + "leisure": "swimming_area" + }, + "name": "Natural Swimming Area" +} diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json index 9412c3b36..35cc577e5 100644 --- a/data/presets/presets/leisure/swimming_pool.json +++ b/data/presets/presets/leisure/swimming_pool.json @@ -9,8 +9,9 @@ "swimming_pool" ], "moreFields": [ - "operator", - "address" + "address", + "opening_hours", + "operator" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index 1d6bc3226..a10cdc02c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -601,6 +601,7 @@ {"key": "sport", "value": "climbing", "description": "🄿 Climbing Gym", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/abseiling.svg?sanitize=true"}, {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"}, {"key": "leisure", "value": "stadium", "description": "🄿 Stadium", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"}, + {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"}, {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-swimming-pool.svg?sanitize=true"}, {"key": "leisure", "value": "track", "description": "🄿 Racetrack (Non-Motorsport)", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/other-line.svg?sanitize=true"}, {"key": "sport", "value": "cycling", "description": "🄿 Cycling Track", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bicycle-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 567058b26..1b75a5606 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6538,6 +6538,10 @@ "name": "Stadium", "terms": "" }, + "leisure/swimming_area": { + "name": "Natural Swimming Area", + "terms": "dive,water,aquatics" + }, "leisure/swimming_pool": { "name": "Swimming Pool", "terms": "dive,water,aquatics"