From 6208998621a39356a137541d38ef8ad4d0047697 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 26 Dec 2019 17:06:29 -0500 Subject: [PATCH] Add Bottle Filling field to Drinking Water preset --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/bottle.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/amenity/drinking_water.json | 3 ++- data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/bottle.json diff --git a/data/presets.yaml b/data/presets.yaml index 26d0bad46..89734d53b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -320,6 +320,9 @@ en: booth: # booth=* label: Booth + bottle: + # bottle=* + label: Bottle Filling boules: # boules=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index b07c68885..7beb57610 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -45,6 +45,7 @@ "board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"}, "bollard": {"key": "bollard", "type": "combo", "label": "Type"}, "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true}, + "bottle": {"key": "bottle", "type": "check", "label": "Bottle Filling"}, "boules": {"key": "boules", "type": "typeCombo", "label": "Type"}, "boundary": {"key": "boundary", "type": "combo", "label": "Type"}, "brand": {"key": "brand", "type": "text", "label": "Brand"}, diff --git a/data/presets/fields/bottle.json b/data/presets/fields/bottle.json new file mode 100644 index 000000000..e8bab97ab --- /dev/null +++ b/data/presets/fields/bottle.json @@ -0,0 +1,5 @@ +{ + "key": "bottle", + "type": "check", + "label": "Bottle Filling" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index ce03de7af..37abe446c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -110,7 +110,7 @@ "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"}, "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"}, "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"}, - "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"}, + "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair", "bottle"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"}, "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"}, "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"}, "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"}, diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json index 19b80403a..e538ca998 100644 --- a/data/presets/presets/amenity/drinking_water.json +++ b/data/presets/presets/amenity/drinking_water.json @@ -6,7 +6,8 @@ "fee", "payment_multi_fee", "charge_fee", - "wheelchair" + "wheelchair", + "bottle" ], "moreFields": [ "covered", diff --git a/data/taginfo.json b/data/taginfo.json index df08b0b45..6b4f52b48 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1330,6 +1330,7 @@ {"key": "board_type", "description": "🄵 Type"}, {"key": "bollard", "description": "🄵 Type"}, {"key": "booth", "description": "🄵 Booth"}, + {"key": "bottle", "description": "🄵 Bottle Filling"}, {"key": "boules", "description": "🄵 Type"}, {"key": "brand", "description": "🄵 Brand"}, {"key": "brewery", "description": "🄵 Draft Beers"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c365292c6..10d3a4e8f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2834,6 +2834,9 @@ "booth": { "label": "Booth" }, + "bottle": { + "label": "Bottle Filling" + }, "boules": { "label": "Type" },