From b75e32bb1b4c9bca69d802123ad398c754f94d76 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 6 Sep 2018 15:28:37 -0400 Subject: [PATCH] Add preset for Parcel Pickup Locker (closes #5260) --- data/presets.yaml | 11 +++++--- data/presets/presets.json | 3 ++- .../vending_machine/parcel_pickup.json | 26 +++++++++++++++++++ .../parcel_pickup_dropoff.json | 4 +-- data/taginfo.json | 9 ++++++- dist/locales/en.json | 8 ++++-- 6 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 data/presets/presets/amenity/vending_machine/parcel_pickup.json diff --git a/data/presets.yaml b/data/presets.yaml index 84fa7b34a..4efecdb3d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2460,11 +2460,16 @@ en: name: Newspaper Vending Machine # 'terms: newspaper' terms: '' + amenity/vending_machine/parcel_pickup: + # 'amenity=vending_machine, vending=parcel_pickup' + name: Parcel Pickup Locker + # 'terms: amazon,locker,mail,parcel,pickup' + terms: '' amenity/vending_machine/parcel_pickup_dropoff: # 'amenity=vending_machine, vending=parcel_pickup;parcel_mail_in' - name: Parcel Pickup/Dropoff Vending Machine - # 'terms: parcel,mail,pickup' - terms: '' + name: Parcel Pickup/Dropoff Locker + # 'terms: mail,parcel,pickup' + terms: '' amenity/vending_machine/parking_tickets: # 'amenity=vending_machine, vending=parking_tickets' name: Parking Ticket Vending Machine diff --git a/data/presets/presets.json b/data/presets/presets.json index 7bba04dec..62e77cb19 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -159,7 +159,8 @@ "amenity/vending_machine/fuel": {"icon": "maki-fuel", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump"}, "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "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/newspapers": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "fee", "payment_multi", "currency_multi"], "geometry": ["point"], "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_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["parcel", "mail", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Vending Machine"}, + "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "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_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["amazon", "locker", "mail", "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_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"}, "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"}, "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"}, diff --git a/data/presets/presets/amenity/vending_machine/parcel_pickup.json b/data/presets/presets/amenity/vending_machine/parcel_pickup.json new file mode 100644 index 000000000..01765c072 --- /dev/null +++ b/data/presets/presets/amenity/vending_machine/parcel_pickup.json @@ -0,0 +1,26 @@ +{ + "icon": "temaki-vending_machine", + "fields": [ + "vending", + "operator" + ], + "geometry": [ + "point" + ], + "terms": [ + "amazon", + "locker", + "mail", + "parcel", + "pickup" + ], + "tags": { + "amenity": "vending_machine", + "vending": "parcel_pickup" + }, + "reference": { + "key": "vending", + "value": "parcel_pickup" + }, + "name": "Parcel Pickup Locker" +} 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 a500ef405..7c20ccf84 100644 --- a/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json +++ b/data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json @@ -10,8 +10,8 @@ "point" ], "terms": [ - "parcel", "mail", + "parcel", "pickup" ], "tags": { @@ -22,5 +22,5 @@ "key": "vending", "value": "parcel_pickup;parcel_mail_in" }, - "name": "Parcel Pickup/Dropoff Vending Machine" + "name": "Parcel Pickup/Dropoff Locker" } diff --git a/data/taginfo.json b/data/taginfo.json index 2d3c6a84e..f5797f12f 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1082,7 +1082,14 @@ { "key": "vending", "value": "parcel_pickup;parcel_mail_in", - "description": "Parcel Pickup/Dropoff Vending Machine", + "description": "Parcel Pickup/Dropoff Locker", + "object_types": ["node"], + "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true" + }, + { + "key": "vending", + "value": "parcel_pickup", + "description": "Parcel Pickup Locker", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 95cef1ff9..5ae64843e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3573,8 +3573,12 @@ "terms": "newspaper" }, "amenity/vending_machine/parcel_pickup_dropoff": { - "name": "Parcel Pickup/Dropoff Vending Machine", - "terms": "parcel,mail,pickup" + "name": "Parcel Pickup/Dropoff Locker", + "terms": "mail,parcel,pickup" + }, + "amenity/vending_machine/parcel_pickup": { + "name": "Parcel Pickup Locker", + "terms": "amazon,locker,mail,parcel,pickup" }, "amenity/vending_machine/parking_tickets": { "name": "Parking Ticket Vending Machine",