From fdfee96f53500e4e2ac331e79991f6b718cc437d Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 1 May 2016 12:16:42 -0400 Subject: [PATCH] Use multiCombo for currency options, add to vending, money exchange, atm (re: #2872) --- data/presets.yaml | 3 ++ data/presets/fields.json | 5 +++ data/presets/fields/currency_multi.json | 5 +++ data/presets/presets.json | 37 +++++++++++++------ data/presets/presets/amenity/atm.json | 1 + .../presets/amenity/bureau_de_change.json | 3 +- .../amenity/vending_machine/cigarettes.json | 3 +- .../amenity/vending_machine/condoms.json | 3 +- .../amenity/vending_machine/drinks.json | 3 +- .../vending_machine/excrement_bags.json | 3 +- .../amenity/vending_machine/news_papers.json | 3 +- .../parcel_pickup_dropoff.json | 3 +- .../vending_machine/parking_tickets.json | 3 +- .../public_transport_tickets.json | 3 +- .../amenity/vending_machine/sweets.json | 3 +- .../vending_machine/vending_machine.json | 3 +- data/presets/presets/shop/money_lender.json | 3 +- dist/locales/en.json | 3 ++ 18 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 data/presets/fields/currency_multi.json diff --git a/data/presets.yaml b/data/presets.yaml index 7570fdd46..831e4720f 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -260,6 +260,9 @@ en: cuisine: # 'cuisine=*' label: Cuisine + currency_multi: + # 'currency:=*' + label: Currency Types cycleway: # 'cycleway:left=*, cycleway:right=*' label: Bike Lanes diff --git a/data/presets/fields.json b/data/presets/fields.json index 31424b336..de019899d 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -340,6 +340,11 @@ "type": "combo", "label": "Cuisine" }, + "currency_multi": { + "key": "currency:", + "type": "multiCombo", + "label": "Currency Types" + }, "cycleway": { "keys": [ "cycleway:left", diff --git a/data/presets/fields/currency_multi.json b/data/presets/fields/currency_multi.json new file mode 100644 index 000000000..ccbb58474 --- /dev/null +++ b/data/presets/fields/currency_multi.json @@ -0,0 +1,5 @@ +{ + "key": "currency:", + "type": "multiCombo", + "label": "Currency Types" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d9b3ebfa4..9e1f24a4f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -357,6 +357,7 @@ "icon": "bank", "fields": [ "operator", + "currency_multi", "drive_through" ], "geometry": [ @@ -570,7 +571,8 @@ "amenity/bureau_de_change": { "icon": "bank", "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point", @@ -1994,7 +1996,8 @@ }, "amenity/vending_machine/cigarettes": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2010,7 +2013,8 @@ }, "amenity/vending_machine/condoms": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2026,7 +2030,8 @@ }, "amenity/vending_machine/drinks": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2046,7 +2051,8 @@ }, "amenity/vending_machine/excrement_bags": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2065,7 +2071,8 @@ }, "amenity/vending_machine/news_papers": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2081,7 +2088,8 @@ }, "amenity/vending_machine/parcel_pickup_dropoff": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2099,7 +2107,8 @@ }, "amenity/vending_machine/parking_tickets": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2116,7 +2125,8 @@ }, "amenity/vending_machine/public_transport_tickets": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2137,7 +2147,8 @@ }, "amenity/vending_machine/sweets": { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -2159,7 +2170,8 @@ "amenity/vending_machine/vending_machine": { "fields": [ "vending", - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" @@ -9132,7 +9144,8 @@ "operator", "address", "building_area", - "opening_hours" + "opening_hours", + "currency_multi" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json index 8f635b0e8..d706437af 100644 --- a/data/presets/presets/amenity/atm.json +++ b/data/presets/presets/amenity/atm.json @@ -2,6 +2,7 @@ "icon": "bank", "fields": [ "operator", + "currency_multi", "drive_through" ], "geometry": [ diff --git a/data/presets/presets/amenity/bureau_de_change.json b/data/presets/presets/amenity/bureau_de_change.json index 8a87551d9..5048096e4 100644 --- a/data/presets/presets/amenity/bureau_de_change.json +++ b/data/presets/presets/amenity/bureau_de_change.json @@ -1,7 +1,8 @@ { "icon": "bank", "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/vending_machine/cigarettes.json b/data/presets/presets/amenity/vending_machine/cigarettes.json index bda9683fe..b7eb7c6d1 100644 --- a/data/presets/presets/amenity/vending_machine/cigarettes.json +++ b/data/presets/presets/amenity/vending_machine/cigarettes.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/condoms.json b/data/presets/presets/amenity/vending_machine/condoms.json index daab85a11..0c2783518 100644 --- a/data/presets/presets/amenity/vending_machine/condoms.json +++ b/data/presets/presets/amenity/vending_machine/condoms.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/drinks.json b/data/presets/presets/amenity/vending_machine/drinks.json index b593edf86..97a267eac 100644 --- a/data/presets/presets/amenity/vending_machine/drinks.json +++ b/data/presets/presets/amenity/vending_machine/drinks.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json index 02385e56b..4f086821b 100644 --- a/data/presets/presets/amenity/vending_machine/excrement_bags.json +++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/news_papers.json b/data/presets/presets/amenity/vending_machine/news_papers.json index 43e8a5c31..f8a69bb65 100644 --- a/data/presets/presets/amenity/vending_machine/news_papers.json +++ b/data/presets/presets/amenity/vending_machine/news_papers.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json index a3b2a7b0a..2cbaf6273 100644 --- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json +++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/parking_tickets.json b/data/presets/presets/amenity/vending_machine/parking_tickets.json index 570c82a33..a6c57ee05 100644 --- a/data/presets/presets/amenity/vending_machine/parking_tickets.json +++ b/data/presets/presets/amenity/vending_machine/parking_tickets.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json index 3195de98d..d47917cda 100644 --- a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json +++ b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/sweets.json b/data/presets/presets/amenity/vending_machine/sweets.json index 896c016f0..ff50792f1 100644 --- a/data/presets/presets/amenity/vending_machine/sweets.json +++ b/data/presets/presets/amenity/vending_machine/sweets.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/amenity/vending_machine/vending_machine.json b/data/presets/presets/amenity/vending_machine/vending_machine.json index a81ebca18..95ff488a4 100644 --- a/data/presets/presets/amenity/vending_machine/vending_machine.json +++ b/data/presets/presets/amenity/vending_machine/vending_machine.json @@ -1,7 +1,8 @@ { "fields": [ "vending", - "operator" + "operator", + "currency_multi" ], "geometry": [ "point" diff --git a/data/presets/presets/shop/money_lender.json b/data/presets/presets/shop/money_lender.json index 43da938b0..defc9b3ff 100644 --- a/data/presets/presets/shop/money_lender.json +++ b/data/presets/presets/shop/money_lender.json @@ -4,7 +4,8 @@ "operator", "address", "building_area", - "opening_hours" + "opening_hours", + "currency_multi" ], "geometry": [ "point", diff --git a/dist/locales/en.json b/dist/locales/en.json index 4df281129..8dd919adc 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -852,6 +852,9 @@ "cuisine": { "label": "Cuisine" }, + "currency_multi": { + "label": "Currency Types" + }, "cycleway": { "label": "Bike Lanes", "placeholder": "none",