From 7acef06e53c8d4f4b31de96cae9b5a4919fece62 Mon Sep 17 00:00:00 2001 From: James Kingdom Date: Mon, 9 Jul 2018 17:37:13 -0400 Subject: [PATCH] Add "cash_in" field to ATM preset (closes #5118) --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/cash_in.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/amenity/atm.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/cash_in.json diff --git a/data/presets.yaml b/data/presets.yaml index 3111b8e3c..d8f5ef079 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -298,6 +298,9 @@ en: label: Capacity # capacity field placeholder placeholder: '50, 100, 200...' + cash_in: + # cash_in=* + label: Cash In castle_type: # castle_type=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index fbb91d3e6..08143a246 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -47,6 +47,7 @@ "camera/mount": {"key": "camera:mount", "type": "combo", "label": "Camera Mount"}, "camera/type": {"key": "camera:type", "type": "combo", "label": "Camera Type", "strings": {"options": {"fixed": "Fixed", "panning": "Panning", "dome": "Dome"}}}, "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."}, + "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"}, "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"}, "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"}, "club": {"key": "club", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/cash_in.json b/data/presets/fields/cash_in.json new file mode 100644 index 000000000..9ccd1dc21 --- /dev/null +++ b/data/presets/fields/cash_in.json @@ -0,0 +1,5 @@ +{ + "key": "cash_in", + "type": "check", + "label": "Cash In" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index f1a5399ad..3dc9fe388 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -45,7 +45,7 @@ "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"}, "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"}, "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"}, - "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "currency_multi", "drive_through"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"}, + "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "cash_in", "currency_multi", "drive_through"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"}, "amenity/bank": {"icon": "maki-bank", "fields": ["name", "atm", "operator", "address", "building_area", "opening_hours", "drive_through"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"}, "amenity/bar": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"}, "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"}, diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json index 0fc28a013..dea7c111c 100644 --- a/data/presets/presets/amenity/atm.json +++ b/data/presets/presets/amenity/atm.json @@ -2,6 +2,7 @@ "icon": "maki-bank", "fields": [ "operator", + "cash_in", "currency_multi", "drive_through" ], diff --git a/data/taginfo.json b/data/taginfo.json index 3700d7288..f4fdd554e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6373,6 +6373,7 @@ {"key": "camera:type", "value": "panning", "description": "Camera Type"}, {"key": "camera:type", "value": "dome", "description": "Camera Type"}, {"key": "capacity", "description": "Capacity"}, + {"key": "cash_in", "description": "Cash In"}, {"key": "castle_type", "description": "Type"}, {"key": "clothes", "description": "Clothes"}, {"key": "collection_times", "description": "Collection Times"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index f48b74e91..9d5a9e9fb 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1629,6 +1629,9 @@ "label": "Capacity", "placeholder": "50, 100, 200..." }, + "cash_in": { + "label": "Cash In" + }, "castle_type": { "label": "Type" },