Merge upstream

This commit is contained in:
Pieter Vander Vennet 2022-12-16 13:40:25 +01:00
parent 87b7bd9bc2
commit 0bd28b996c
124 changed files with 2643 additions and 1009 deletions

View file

@ -165,7 +165,7 @@ The question is Can you send packages from this parcel locker?
- You <b>can't</b> send packages from this parcel locker corresponds with `<a href='https://wiki.openstreetmap.org/wiki/Key:parcel_mail_in' target='_blank'>parcel_mail_in</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:parcel_mail_in%3Dno' target='_blank'>no</a>`
Only visible if `amenity=parcel_locker` is shown
This tagrendering is only visible in the popup if the following condition is met: `amenity=parcel_locker`
@ -183,6 +183,6 @@ The question is Can you pick up packages from this parcel locker?
- You <b>can't</b> pick up packages from this parcel locker corresponds with `<a href='https://wiki.openstreetmap.org/wiki/Key:parcel_pickup' target='_blank'>parcel_pickup</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:parcel_pickup%3Dno' target='_blank'>no</a>`
Only visible if `amenity=parcel_locker` is shown
This tagrendering is only visible in the popup if the following condition is met: `amenity=parcel_locker`
This document is autogenerated from [assets/layers/parcel_lockers/parcel_lockers.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/parcel_lockers/parcel_lockers.json)