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

@ -116,6 +116,6 @@ The question is Is the OpenStreetMap-attribution given?
- This option cannot be chosen as answer
Only visible if `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM` is shown
This tagrendering is only visible in the popup if the following condition is met: `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM`
This document is autogenerated from [assets/layers/map/map.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/map/map.json)