From 8741aa8f9aaedd4222abb5ced8ffb136f5a77a10 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 20 Nov 2019 10:30:04 -0500 Subject: [PATCH] Add Drinks field to the Drink Vending Machine preset --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/drink_multi.json | 5 +++++ data/presets/presets.json | 6 +++--- data/presets/presets/amenity/vending_machine/drinks.json | 5 +++++ .../presets/amenity/vending_machine/excrement_bags.json | 3 --- .../presets/presets/amenity/vending_machine/newspapers.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 9 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/drink_multi.json diff --git a/data/presets.yaml b/data/presets.yaml index 55e8b89b8..1af118705 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -711,6 +711,9 @@ en: door_type: # door=* label: Type + drink_multi: + # 'drink:=*' + label: Drinks drive_through: # drive_through=* label: Drive-Through diff --git a/data/presets/fields.json b/data/presets/fields.json index aec99e085..ad5f3407d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -119,6 +119,7 @@ "dog": {"key": "dog", "type": "combo", "label": "Dogs", "strings": {"options": {"yes": "Allowed", "leashed": "Leashed Only", "no": "Not Allowed"}}, "terms": ["animals", "pets"]}, "door_type": {"key": "door", "type": "typeCombo", "label": "Type"}, "door": {"key": "door", "type": "combo", "label": "Door"}, + "drink_multi": {"key": "drink:", "type": "multiCombo", "label": "Drinks"}, "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"}, "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"}, "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}}, diff --git a/data/presets/fields/drink_multi.json b/data/presets/fields/drink_multi.json new file mode 100644 index 000000000..3cc819ad6 --- /dev/null +++ b/data/presets/fields/drink_multi.json @@ -0,0 +1,5 @@ +{ + "key": "drink:", + "type": "multiCombo", + "label": "Drinks" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index aea9cd87d..07ffc7043 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -246,17 +246,17 @@ "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_cigarettes", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point", "vertex"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"}, "amenity/vending_machine/coffee": {"icon": "temaki-vending_hot_drink", "geometry": ["point", "vertex"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"}, "amenity/vending_machine/condoms": {"icon": "temaki-vending_love", "geometry": ["point", "vertex"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"}, - "amenity/vending_machine/drinks": {"icon": "temaki-vending_cold_drink", "geometry": ["point", "vertex"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"}, + "amenity/vending_machine/drinks": {"icon": "temaki-vending_cold_drink", "fields": ["vending", "drink_multi", "{amenity/vending_machine}"], "geometry": ["point", "vertex"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"}, "amenity/vending_machine/eggs": {"icon": "temaki-vending_eggs", "geometry": ["point", "vertex"], "terms": ["egg"], "tags": {"amenity": "vending_machine", "vending": "eggs"}, "reference": {"key": "vending", "value": "eggs"}, "name": "Egg Vending Machine"}, "amenity/vending_machine/electronics": {"icon": "temaki-vending_machine", "geometry": ["point", "vertex"], "terms": ["cable", "charger", "earbud", "headphone", "phone", "tablet"], "tags": {"amenity": "vending_machine", "vending": "electronics"}, "reference": {"key": "vending", "value": "electronics"}, "name": "Electronics Vending Machine"}, "amenity/vending_machine/elongated_coin": {"icon": "temaki-vending_flat_coin", "geometry": ["point", "vertex"], "terms": ["coin", "crush", "elongated", "flatten", "penny", "souvenir"], "tags": {"amenity": "vending_machine", "vending": "elongated_coin"}, "reference": {"key": "vending", "value": "elongated_coin"}, "name": "Flat Coin Vending Machine"}, - "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_pet_waste", "fields": ["{amenity/vending_machine}"], "geometry": ["point", "vertex"], "terms": ["excrement bags", "poop", "waste", "dog", "animal"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"}, + "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_pet_waste", "geometry": ["point", "vertex"], "terms": ["excrement bags", "poop", "waste", "dog", "animal"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"}, "amenity/vending_machine/feminine_hygiene": {"icon": "temaki-vending_venus", "geometry": ["point", "vertex"], "terms": ["condom", "tampon", "pad", "woman", "women", "menstrual hygiene products", "personal care"], "tags": {"amenity": "vending_machine", "vending": "feminine_hygiene"}, "reference": {"key": "vending", "value": "feminine_hygiene"}, "name": "Feminine Hygiene Vending Machine"}, "amenity/vending_machine/food": {"icon": "temaki-vending_machine", "geometry": ["point", "vertex"], "terms": ["food"], "tags": {"amenity": "vending_machine", "vending": "food"}, "reference": {"key": "vending", "value": "food"}, "name": "Food Vending Machine"}, "amenity/vending_machine/fuel": {"icon": "maki-fuel", "geometry": ["point", "vertex"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump", "matchScore": 0.5}, "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_ice_cream", "geometry": ["point", "vertex"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"}, "amenity/vending_machine/ice_cubes": {"icon": "temaki-vending_ice", "geometry": ["point", "vertex"], "terms": ["cubes", "ice"], "tags": {"amenity": "vending_machine", "vending": "ice_cubes"}, "reference": {"key": "vending", "value": "ice_cubes"}, "name": "Ice Vending Machine"}, - "amenity/vending_machine/newspapers": {"icon": "temaki-vending_newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"}, + "amenity/vending_machine/newspapers": {"icon": "temaki-vending_newspaper", "fields": ["vending", "ref", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"}, "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point", "vertex"], "terms": ["mail", "packstation", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"}, "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_lockers", "fields": ["vending", "operator"], "geometry": ["point", "vertex"], "terms": ["amazon", "locker", "mail", "packstation", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"}, "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_tickets", "geometry": ["point", "vertex"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"}, diff --git a/data/presets/presets/amenity/vending_machine/drinks.json b/data/presets/presets/amenity/vending_machine/drinks.json index 0db58d761..1eee9a844 100644 --- a/data/presets/presets/amenity/vending_machine/drinks.json +++ b/data/presets/presets/amenity/vending_machine/drinks.json @@ -1,5 +1,10 @@ { "icon": "temaki-vending_cold_drink", + "fields": [ + "vending", + "drink_multi", + "{amenity/vending_machine}" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json index 2bf09832e..cf3cfca1b 100644 --- a/data/presets/presets/amenity/vending_machine/excrement_bags.json +++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json @@ -1,8 +1,5 @@ { "icon": "temaki-vending_pet_waste", - "fields": [ - "{amenity/vending_machine}" - ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/amenity/vending_machine/newspapers.json b/data/presets/presets/amenity/vending_machine/newspapers.json index 575d40e60..19cc0788e 100644 --- a/data/presets/presets/amenity/vending_machine/newspapers.json +++ b/data/presets/presets/amenity/vending_machine/newspapers.json @@ -2,6 +2,7 @@ "icon": "temaki-vending_newspaper", "fields": [ "vending", + "ref", "operator", "fee", "payment_multi_fee", diff --git a/data/taginfo.json b/data/taginfo.json index 448aa0ee0..99f22d006 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1424,6 +1424,7 @@ {"key": "dog", "value": "leashed", "description": "🄵 Dogs"}, {"key": "dog", "value": "no", "description": "🄵 Dogs"}, {"key": "door", "description": "🄵 Type, 🄵 Door"}, + {"key": "drink:", "description": "🄵 Drinks"}, {"key": "drive_through", "description": "🄵 Drive-Through"}, {"key": "duration", "description": "🄵 Duration"}, {"key": "electrified", "value": "contact_line", "description": "🄵 Electrification"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d356db429..3cec76e65 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3080,6 +3080,9 @@ "door": { "label": "Door" }, + "drink_multi": { + "label": "Drinks" + }, "drive_through": { "label": "Drive-Through", "terms": ""