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 18587)
+++ b/resources/data/validator/deprecated.mapcss	(date 1667865910411)
@@ -2350,6 +2350,31 @@
   group: tr("deprecated tagging");
 }
 
+/* #21782 */
+*[amenity=vending_machine][vending=parcel_mail_in],
+*[amenity=vending_machine][vending=parcel_pickup] {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  suggestAlternative: "amenity=parcel_locker + {1.value}=yes";
+  fixAdd: "amenity=parcel_locker";
+  fixAdd: "{1.value}=yes";
+  fixRemove: "vending";
+  group: tr("deprecated tagging");
+  assertMatch: "node amenity=vending_machine vending=parcel_mail_in";
+  assertMatch: "node amenity=vending_machine vending=parcel_pickup";
+}
+*[amenity=vending_machine][vending="parcel_mail_in;parcel_pickup"],
+*[amenity=vending_machine][vending="parcel_pickup;parcel_mail_in"] {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  suggestAlternative: "amenity=parcel_locker + parcel_pickup=yes + parcel_mail_in=yes";
+  fixAdd: "amenity=parcel_locker";
+  fixAdd: "parcel_pickup=yes";
+  fixAdd: "parcel_mail_in=yes";
+  fixRemove: "vending";
+  group: tr("deprecated tagging");
+  assertMatch: "node amenity=vending_machine vending=parcel_mail_in;parcel_pickup";
+  assertMatch: "node amenity=vending_machine vending=parcel_pickup;parcel_mail_in";
+}
+
 /* #21954 decoturf was added to JOSM presets in r8123 and replaced with acrylic in r18404 */
 *[surface=decoturf] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
@@ -2401,7 +2426,7 @@
   group: tr("deprecated tagging");
 }
 
-/* temporary URLs, can be exteded to other websites and other keys e.g. "url" or "website", #22397 */
+/* temporary URLs, can be extended to other websites and other keys e.g. "url" or "website", #22397 */
 *[image][image=~/^https:\/\/westnordost.de\/p\//] {
   throwWarning: tr("{0} with a temporary URL which may be outdated very soon", "{0.key}");
   fixRemove: "{0.key}";
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 18587)
+++ b/resources/data/validator/ignoretags.cfg	(date 1667866312279)
@@ -572,6 +572,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
@@ -738,7 +740,6 @@
 K:advertising=board
 K:amenity=childcare
 K:amenity=loading_dock
-K:amenity=parcel_locker
 K:amenity=payment_terminal
 K:barrier=sliding_gate
 K:boundary=forest_compartment
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 18587)
+++ b/resources/data/defaultpresets.xml	(date 1667863655237)
@@ -7998,11 +7998,30 @@
         <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;fuel;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;fuel;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" />
+            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Sa 08:00|Mo-Fr 09:00; Sa 07:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" values_no_i18n="true" />
+            <space/>
+            <reference ref="ref_operator" />
+            <space/>
+            <reference ref="wheelchair" />
+            <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/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 1664700931262)
+++ b/resources/images/presets/service/parcel_locker.svg	(date 1664700931262)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.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">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M3,0h10c1.7,0,3,1.3,3,3v10c0,1.7-1.3,3-3,3H3
+	c-1.7,0-3-1.3-3-3V3C0,1.3,1.3,0,3,0z"/>
+    <path fill="#734A08" d="M3.4,6.2v5.5l5.6,2.7V8.9L3.4,6.2z"/>
+    <path fill="#734A08" d="M14.5,5.2L9.9,8.3l0,5.5l4.6-3L14.5,5.2z"/>
+    <path fill="#734A08" d="M8.5,1.5L3.4,5.2l5.6,2.7l5.6-3.6v0L8.5,1.5z"/>
+    <path fill="#734A08" d="M1.5,14.5h2.8v-0.9H2.4V2.4h1.9V1.5H1.5V14.5z"/>
+</svg>
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 18587)
+++ b/resources/styles/standard/elemstyles.mapcss	(date 1664663399218)
@@ -3560,6 +3560,13 @@
     icon-image: "presets/service/excrement_bags.svg";
     set icon_z17;
 }
+node[amenity=parcel_locker] {
+    icon-image: "presets/service/parcel_locker.svg";
+    set icon_z17;
+}
+area[amenity=parcel_locker] {
+    fill-color: parcel_locker#734a08;
+}
 
 /**************/
 /* craft tags */