Changeset 18719 in josm for trunk/resources/data/validator

Timestamp:

2023-04-27T16:45:28+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #21782: Deprecate vending=parcel_pickup (patch by gaben, modified)

On 2022-01-03, the ​osmwiki:Proposed_features/amenity=parcel_locker was approved.
It specifically deprecated vending=parcel_pickup and vending_parcel_mail_in.

Location:

trunk/resources/data/validator

Files:

• deprecated.mapcss (modified) (1 diff)
• ignoretags.cfg (modified) (2 diffs)

trunk/resources/data/validator/deprecated.mapcss

@@ -2364 +2364 @@
 }
 
+/* #21782 */
+*[amenity=vending_machine][vending=parcel_mail_in],
+*[amenity=vending_machine][vending=parcel_pickup] {
+  set .parcel_fixable;
+  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][vending~=parcel_mail_in][vending~=parcel_pickup][count(uniq_list(split(";", tag("vending")))) == 2] {
+  set .parcel_fixable;
+  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";
+}
+*[amenity=vending_machine][vending~=parcel_mail_in]!.parcel_fixable,
+*[amenity=vending_machine][vending~=parcel_pickup]!.parcel_fixable {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  suggestAlternative: "amenity=parcel_locker + {1.value}=yes";
+  assertMatch: "node amenity=vending_machine vending=parcel_pickup;stamp";
+  group: tr("deprecated tagging");
+}
+
 /* #21954 decoturf was added to JOSM presets in r8123 and replaced with acrylic in r18404 */
 *[surface=decoturf] {

trunk/resources/data/validator/ignoretags.cfg

@@ -575 +575 @@
 K:vending=photos
 K:vending=photo
+K:vending=parcel_pickup
+K:vending=parcel_mail_in
 K:vending=parcel_pickup;parcel_mail_in
 E:tracktype
@@ -744 +746 @@
 K:amenity=childcare
 K:amenity=loading_dock
-K:amenity=parcel_locker
 K:amenity=payment_terminal
 K:barrier=sliding_gate