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 @@
-
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
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 @@
+
+
\ No newline at end of file