Index: resources/data/defaultpresets.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
--- a/resources/data/defaultpresets.xml	(revision 18412)
+++ b/resources/data/defaultpresets.xml	(date 1648048427804)
@@ -7964,11 +7964,28 @@
         <link wiki="Tag:amenity=vending_machine" />
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
         <preset_link preset_name="Payment Methods" />
     </item> <!-- Vending Machine -->
+    <item name="Parcel Locker" icon="presets/service/parcel_locker.svg" type="node,closedway" preset_name_label="true">
+        <link wiki="Tag:amenity=parcel_locker" />
+        <space/>
+        <key key="amenity" value="parcel_locker" />
+        <text key="brand" text="Brand" />
+        <optional>
+            <combo key="parcel_mail_in" text="Parcel mail in" values="yes,no,returns_only" values_sort="false" />
+            <combo key="parcel_pickup" text="Parcel pickup" values="yes,no" values_sort="false" />
+            <space/>
+            <reference ref="ref_operator" />
+            <space/>
+            <reference ref="color" />
+            <space/>
+            <check key="refrigerated" text="Refrigerated" />
+        </optional>
+        <preset_link preset_name="Payment Methods" />
+    </item> <!-- Parcel Locker -->
     <item name="Payment Methods" icon="presets/money/dollar.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
         <link wiki="Key:payment" />
         <space />
Index: resources/data/validator/deprecated.mapcss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
--- a/resources/data/validator/deprecated.mapcss	(revision 18412)
+++ b/resources/data/validator/deprecated.mapcss	(date 1648045122376)
@@ -2326,6 +2326,18 @@
   group: tr("deprecated tagging");
 }
 
+/* #21782 */
+*[amenity=vending_machine][vending =~ /^((parcel_mail_in|parcel_pickup)(;? ?))+$/] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "amenity=parcel_locker";
+  fixAdd: "amenity=parcel_locker";
+  fixRemove: "vending"
+  group: tr("deprecated tagging");
+  assertMatch: "node amenity=vending_machine vending=parcel_mail_in"
+  assertMatch: "node amenity=vending_machine vending=parcel_pickup"
+  assertMatch: "node amenity=vending_machine vending=parcel_mail_in;parcel_pickup"
+}
+
 /* #21954 decoturf was added to JOSM presets in r8123 and replaced with acrylic in r18404 */
 *[surface=decoturf] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
Index: resources/styles/standard/elemstyles.mapcss
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
--- a/resources/styles/standard/elemstyles.mapcss	(revision 18412)
+++ b/resources/styles/standard/elemstyles.mapcss	(date 1648047008258)
@@ -3560,6 +3560,10 @@
     icon-image: "presets/service/excrement_bags.svg";
     set icon_z17;
 }
+node[amenity=parcel_locker] {
+    icon-image: "presets/service/parcel_locker.svg";
+    set icon_z17;
+}
 
 /**************/
 /* craft tags */
Index: resources/data/validator/ignoretags.cfg
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
--- a/resources/data/validator/ignoretags.cfg	(revision 18412)
+++ b/resources/data/validator/ignoretags.cfg	(date 1648043100230)
@@ -571,6 +571,8 @@
 K:vending=news_papers
 K:vending=photos
 K:vending=photo
+K:vending=parcel_pickup
+K:vending=parcel_mail_in
 K:vending=parcel_pickup;parcel_mail_in
 E:tracktype
 E:area
Index: resources/images/presets/service/parcel_locker.svg
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/resources/images/presets/service/parcel_locker.svg b/resources/images/presets/service/parcel_locker.svg
new file mode 100644
--- /dev/null	(date 1648047782052)
+++ b/resources/images/presets/service/parcel_locker.svg	(date 1648047782052)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="surface1">
+	<path fill="#734A08" stroke="#734A08" stroke-width="0.25" stroke-miterlimit="10" d="M0,2h16v1h-1v3h-4V3h-1v3H6V3H5v3H1V3H0V2z
+		 M1,7h4v2H1V7z M11,7h4v2h-4V7z M7,8h2v1H7V8z M1,10h4v2H1V10z M6,10h4v2H6V10z M11,10h4v2h-4V10z M1,13h14v1H1V13z"/>
+</g>
+</svg>
\ No newline at end of file