mirror of
https://github.com/FoggedLens/id-tagging-schema.git
synced 2026-05-22 16:19:42 +02:00
hotfix for wrongly applied tagging upgrade for parcel lockers
The upgrade paths for the old `vending=parcel_pickup` and `vending=parcel_mail_in` tags overlap for the case of a feature tagged as `parcel_pickup;parcel_mail_in`. This casuses all three matching `replacement`s to be applied in iD. The value of the `parcel_mail_in` conflicts in this case. Since for `parcel_pickup` the implied `yes` default should not be set, it is impossible to resolve this ambiguity with the current schema of `deprecated.json`. This hotfix/workaround solves this by skipping the upgrade path for `vending=parcel_mail_in`-only features. This minimally impacts the functionality, as such parcel lockers are much less common than pickup-only or combined ones (250 vs. 18k features). closes #364
This commit is contained in:
+4
-12
@@ -175,14 +175,6 @@
|
||||
"old": {"amenity": "vending_machine", "vending": "news_papers"},
|
||||
"replace": {"amenity": "vending_machine", "vending": "newspapers"}
|
||||
},
|
||||
{
|
||||
"old": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"},
|
||||
"replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
|
||||
},
|
||||
{
|
||||
"old": {"amenity": "vending_machine", "vending": "parcel_mail_in"},
|
||||
"replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes", "parcel_pickup": "no"}
|
||||
},
|
||||
{
|
||||
"old": {"amenity": "vending_machine", "vending": "parcel_pickup"},
|
||||
"replace": {"amenity": "parcel_locker"}
|
||||
@@ -191,6 +183,10 @@
|
||||
"old": {"amenity": "vending_machine", "vending": "parcel_mail_in;parcel_pickup"},
|
||||
"replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
|
||||
},
|
||||
{
|
||||
"old": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"},
|
||||
"replace": {"amenity": "parcel_locker", "parcel_mail_in": "yes"}
|
||||
},
|
||||
{
|
||||
"old": {"amenity": "weigh_bridge"},
|
||||
"replace": {"amenity": "weighbridge"}
|
||||
@@ -1735,10 +1731,6 @@
|
||||
"old": {"unnamed": "*"},
|
||||
"replace": {"noname": "$1"}
|
||||
},
|
||||
{
|
||||
"old": {"vending": "parcel_mail_in;parcel_pickup"},
|
||||
"replace": {"vending": "parcel_pickup;parcel_mail_in"}
|
||||
},
|
||||
{
|
||||
"old": {"vhf_channel": "*"},
|
||||
"replace": {"vhf": "$1"}
|
||||
|
||||
Vendored
+10
-29
@@ -362,27 +362,6 @@
|
||||
"vending": "newspapers"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"amenity": "vending_machine",
|
||||
"vending": "parcel_pickup;parcel_mail_in"
|
||||
},
|
||||
"replace": {
|
||||
"amenity": "parcel_locker",
|
||||
"parcel_mail_in": "yes"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"amenity": "vending_machine",
|
||||
"vending": "parcel_mail_in"
|
||||
},
|
||||
"replace": {
|
||||
"amenity": "parcel_locker",
|
||||
"parcel_mail_in": "yes",
|
||||
"parcel_pickup": "no"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"amenity": "vending_machine",
|
||||
@@ -402,6 +381,16 @@
|
||||
"parcel_mail_in": "yes"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"amenity": "vending_machine",
|
||||
"vending": "parcel_pickup;parcel_mail_in"
|
||||
},
|
||||
"replace": {
|
||||
"amenity": "parcel_locker",
|
||||
"parcel_mail_in": "yes"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"amenity": "weigh_bridge"
|
||||
@@ -3624,14 +3613,6 @@
|
||||
"noname": "$1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"vending": "parcel_mail_in;parcel_pickup"
|
||||
},
|
||||
"replace": {
|
||||
"vending": "parcel_pickup;parcel_mail_in"
|
||||
}
|
||||
},
|
||||
{
|
||||
"old": {
|
||||
"vhf_channel": "*"
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
-5
@@ -18942,11 +18942,6 @@
|
||||
"key": "unnamed",
|
||||
"description": "🄳 ➜ noname=*"
|
||||
},
|
||||
{
|
||||
"key": "vending",
|
||||
"value": "parcel_mail_in;parcel_pickup",
|
||||
"description": "🄳 ➜ vending=parcel_pickup;parcel_mail_in"
|
||||
},
|
||||
{
|
||||
"key": "vhf_channel",
|
||||
"description": "🄳 ➜ vhf=*"
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user