From 8f9e06788005ba60742767b7a52e6152ee8a5ef0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 9 Apr 2020 10:08:48 -0700 Subject: [PATCH] Add Botanical Garden and Community Garden presets (re: #7501) Add search terms and Operator Type field to Garden preset Remove vertex geometry from garden preset --- data/presets.yaml | 11 ++++++++++ data/presets/presets.json | 4 +++- data/presets/presets/leisure/garden.json | 9 +++++++- .../presets/leisure/garden/botanical.json | 21 +++++++++++++++++++ .../presets/leisure/garden/community.json | 21 +++++++++++++++++++ data/taginfo.json | 2 ++ dist/locales/en.json | 10 ++++++++- 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 data/presets/presets/leisure/garden/botanical.json create mode 100644 data/presets/presets/leisure/garden/community.json diff --git a/data/presets.yaml b/data/presets.yaml index f24d75107..508988005 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5861,7 +5861,18 @@ en: leisure/garden: # leisure=garden name: Garden + # 'terms: flowers,fruits,herbs,plants,vegetables' terms: '' + leisure/garden/botanical: + # 'leisure=garden, garden:type=botanical' + name: Botanical Garden + # 'terms: botanic garden,plant collection,rare plants' + terms: '' + leisure/garden/community: + # 'leisure=garden, garden:type=community' + name: Community Garden + # 'terms: co-op garden,collective garden,communal garden' + terms: '' leisure/golf_course: # leisure=golf_course name: Golf Course diff --git a/data/presets/presets.json b/data/presets/presets.json index eea73938e..7e902b1d1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -674,7 +674,9 @@ "leisure/fitness_station/sign": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sign"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sign", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Exercise Instruction Sign"}, "leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "situp", "sit up", "trim trail"], "name": "Sit-Up Station"}, "leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"}, - "leisure/garden": {"icon": "maki-garden", "fields": ["name", "garden/type", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"}, + "leisure/garden": {"icon": "maki-garden", "fields": ["name", "garden/type", "operator", "operator/type", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "garden"}, "terms": ["flowers", "fruits", "herbs", "plants", "vegetables"], "name": "Garden"}, + "leisure/garden/botanical": {"icon": "maki-garden", "geometry": ["point", "area"], "tags": {"leisure": "garden", "garden:type": "botanical"}, "reference": {"key": "garden:type", "value": "botanical"}, "terms": ["botanic garden", "plant collection", "rare plants"], "name": "Botanical Garden"}, + "leisure/garden/community": {"icon": "maki-garden", "geometry": ["point", "area"], "tags": {"leisure": "garden", "garden:type": "community"}, "reference": {"key": "garden:type", "value": "community"}, "terms": ["co-op garden", "collective garden", "communal garden"], "name": "Community Garden"}, "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"}, "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "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": ["email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"}, diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json index ae4a1a562..79d19864a 100644 --- a/data/presets/presets/leisure/garden.json +++ b/data/presets/presets/leisure/garden.json @@ -4,6 +4,7 @@ "name", "garden/type", "operator", + "operator/type", "access_simple", "fee", "payment_multi_fee", @@ -18,11 +19,17 @@ ], "geometry": [ "point", - "vertex", "area" ], "tags": { "leisure": "garden" }, + "terms": [ + "flowers", + "fruits", + "herbs", + "plants", + "vegetables" + ], "name": "Garden" } diff --git a/data/presets/presets/leisure/garden/botanical.json b/data/presets/presets/leisure/garden/botanical.json new file mode 100644 index 000000000..21f2f343d --- /dev/null +++ b/data/presets/presets/leisure/garden/botanical.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-garden", + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "garden", + "garden:type": "botanical" + }, + "reference": { + "key": "garden:type", + "value": "botanical" + }, + "terms": [ + "botanic garden", + "plant collection", + "rare plants" + ], + "name": "Botanical Garden" +} diff --git a/data/presets/presets/leisure/garden/community.json b/data/presets/presets/leisure/garden/community.json new file mode 100644 index 000000000..9c9959fd7 --- /dev/null +++ b/data/presets/presets/leisure/garden/community.json @@ -0,0 +1,21 @@ +{ + "icon": "maki-garden", + "geometry": [ + "point", + "area" + ], + "tags": { + "leisure": "garden", + "garden:type": "community" + }, + "reference": { + "key": "garden:type", + "value": "community" + }, + "terms": [ + "co-op garden", + "collective garden", + "communal garden" + ], + "name": "Community Garden" +} diff --git a/data/taginfo.json b/data/taginfo.json index 052a22ce3..b07d7bc41 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -657,6 +657,8 @@ {"key": "fitness_station", "value": "sit-up", "description": "🄿 Sit-Up Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, {"key": "fitness_station", "value": "stairs", "description": "🄿 Exercise Stairs", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, {"key": "leisure", "value": "garden", "description": "🄿 Garden", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, + {"key": "garden:type", "value": "botanical", "description": "🄿 Botanical Garden", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, + {"key": "garden:type", "value": "community", "description": "🄿 Community Garden", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, {"key": "leisure", "value": "golf_course", "description": "🄿 Golf Course", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"}, {"key": "leisure", "value": "hackerspace", "description": "🄿 Hackerspace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-code.svg"}, {"key": "leisure", "value": "horse_riding", "description": "🄿 Horseback Riding Facility, 🄵 Horseback Riding", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7cdf51675..f85cdc92a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7610,7 +7610,15 @@ }, "leisure/garden": { "name": "Garden", - "terms": "" + "terms": "flowers,fruits,herbs,plants,vegetables" + }, + "leisure/garden/botanical": { + "name": "Botanical Garden", + "terms": "botanic garden,plant collection,rare plants" + }, + "leisure/garden/community": { + "name": "Community Garden", + "terms": "co-op garden,collective garden,communal garden" }, "leisure/golf_course": { "name": "Golf Course",