From 813b71105812ed83b8604c96c6d79b78e758e78a Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 19 Dec 2019 13:28:40 -0500 Subject: [PATCH] Rename "Firepit" preset to "Fire Pit" and add terms and fields --- data/presets.yaml | 6 +++--- data/presets/presets.json | 2 +- data/presets/presets/leisure/firepit.json | 18 +++++++++++++++--- data/taginfo.json | 2 +- dist/locales/en.json | 4 ++-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 4e0573ec2..e65026b36 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5551,9 +5551,9 @@ en: terms: '' leisure/firepit: # leisure=firepit - name: Firepit - # 'terms: fireplace,campfire' - terms: '' + name: Fire Pit + # 'terms: bonfire,campfire,fire circle,fire hole,fire place,fire ring,firepit,fireplace,firering' + terms: '' leisure/fishing: # leisure=fishing name: Fishing Spot diff --git a/data/presets/presets.json b/data/presets/presets.json index eef0fbe00..1d679247e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -644,7 +644,7 @@ "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "gnis/feature_id", "lit", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"}, "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"}, "leisure/escape_game": {"icon": "fas-puzzle-piece", "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", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"}, - "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"}, + "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple", "seasonal", "width"], "moreFields": ["ref"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["bonfire", "campfire", "fire circle", "fire hole", "fire place", "fire ring", "firepit", "fireplace", "firering"], "name": "Fire Pit"}, "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"}, "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"}, "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"}, diff --git a/data/presets/presets/leisure/firepit.json b/data/presets/presets/leisure/firepit.json index 59f46b5cb..03d8cdc25 100644 --- a/data/presets/presets/leisure/firepit.json +++ b/data/presets/presets/leisure/firepit.json @@ -1,7 +1,12 @@ { "icon": "temaki-campfire", "fields": [ - "access_simple" + "access_simple", + "seasonal", + "width" + ], + "moreFields": [ + "ref" ], "geometry": [ "point", @@ -11,8 +16,15 @@ "leisure": "firepit" }, "terms": [ + "bonfire", + "campfire", + "fire circle", + "fire hole", + "fire place", + "fire ring", + "firepit", "fireplace", - "campfire" + "firering" ], - "name": "Firepit" + "name": "Fire Pit" } diff --git a/data/taginfo.json b/data/taginfo.json index d0f7e1431..7811b38f1 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -626,7 +626,7 @@ {"key": "leisure", "value": "disc_golf_course", "description": "🄿 Disc Golf Course", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/disc_golf_basket.svg"}, {"key": "leisure", "value": "dog_park", "description": "🄿 Dog Park", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"}, {"key": "leisure", "value": "escape_game", "description": "🄿 Escape Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-puzzle-piece.svg"}, - {"key": "leisure", "value": "firepit", "description": "🄿 Firepit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/campfire.svg"}, + {"key": "leisure", "value": "firepit", "description": "🄿 Fire Pit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/campfire.svg"}, {"key": "leisure", "value": "fishing", "description": "🄿 Fishing Spot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-fish.svg"}, {"key": "leisure", "value": "fitness_centre", "description": "🄿 Gym / Fitness Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dumbbell.svg"}, {"key": "sport", "value": "yoga", "description": "🄿 Yoga Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 31abab65e..3d9ac4195 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7326,8 +7326,8 @@ "terms": "escape game,escape the room,puzzle room,quest room" }, "leisure/firepit": { - "name": "Firepit", - "terms": "fireplace,campfire" + "name": "Fire Pit", + "terms": "bonfire,campfire,fire circle,fire hole,fire place,fire ring,firepit,fireplace,firering" }, "leisure/fishing": { "name": "Fishing Spot",