Merge master

This commit is contained in:
Pieter Vander Vennet 2022-12-08 03:02:17 +01:00
commit 24ed527ff7
65 changed files with 991 additions and 1472 deletions

View file

@ -67,14 +67,6 @@ attribute | type | values which are supported by this layer
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/direction#values) [direction](https://wiki.openstreetmap.org/wiki/Key:direction) | [direction](../SpecialInputElements.md#direction) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/colour#values) [colour](https://wiki.openstreetmap.org/wiki/Key:colour) | [color](../SpecialInputElements.md#color) | [brown](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown) [green](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen) [gray](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray) [white](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite) [red](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred) [black](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack) [blue](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue) [yellow](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/tourism#values) [tourism](https://wiki.openstreetmap.org/wiki/Key:tourism) | Multiple choice | [artwork](https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dartwork) [](https://wiki.openstreetmap.org/wiki/Tag:tourism%3D)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artwork_type#values) [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) | [string](../SpecialInputElements.md#string) | [architecture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Darchitecture) [mural](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dmural) [painting](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dpainting) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dsculpture) [statue](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstatue) [bust](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dbust) [stone](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstone) [installation](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dinstallation) [graffiti](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dgraffiti) [relief](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief) [azulejo](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo) [tilework](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework) [woodcarving](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dwoodcarving)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist:wikidata#values) [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist_name#values) [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) | [string](../SpecialInputElements.md#string) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |
@ -105,8 +97,6 @@ The question is *Does this bench have a backrest?*
- *Does <b>not</b> have a backrest* corresponds with `backrest=no`
This tagrendering has labels `bench-questions`
### bench-seats
@ -123,13 +113,6 @@ This is rendered with `{seats} seats`
- *This bench does not have separated seats* corresponds with `seats:separated=no`
This tagrendering has labels `bench-questions`
### bench-material
@ -152,8 +135,6 @@ This is rendered with `Material: {material}`
- *The seating is made from steel* corresponds with `material=steel`
This tagrendering has labels `bench-questions`
### bench-direction
@ -168,8 +149,6 @@ This is rendered with `When sitting on the bench, one looks towards {direction}
This tagrendering has labels `bench-questions`
### bench-colour
@ -196,8 +175,6 @@ This is rendered with `Colour: {colour}`
- *Colour: yellow* corresponds with `colour=yellow`
This tagrendering has labels `bench-questions`
### bench-survey:date
@ -215,205 +192,6 @@ This is rendered with `This bench was last surveyed on {survey:date}`
- *Surveyed today!* corresponds with `survey:date=`
This tagrendering has labels `bench-questions`
### bench-inscription
The question is *Does this bench have an inscription?<div class='subtle text-lg'>E.g. on a mounted plaque, in the backrest, ...</div>*
This rendering asks information about the property [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription)
This is rendered with `This bench does have the following inscription:<br/><p><i>{inscription}</i></p>`
- *This bench does not have an inscription* corresponds with `not:inscription=yes`
- *This bench does <span class='subtle'>(probably)</span> not have an inscription* corresponds with ``
- This option cannot be chosen as answer
This tagrendering has labels `bench-questions`
### bench-artwork
The question is *Does this bench have an artistic element?<div class='subtle text-lg'>E.g. it has an integrated painting, statue or other non-trivial, creative work</div>*
- *This bench has an integrated artwork* corresponds with `tourism=artwork`
- *This bench does not have an integrated artwork* corresponds with ``
### bench-memorial
The question is *Does this bench act as memorial for someone or something?*
- *This bench is a memorial for someone or something* corresponds with `historic=memorial`
- *This bench is a <b>not</b> a memorial for someone or something* corresponds with `not:historic=memorial`
This tagrendering is only visible in the popup if the following condition is met: `historic=memorial|inscription~.+|memorial=bench|tourism=artwork`
This tagrendering has labels `bench-questions`
### artwork-artwork_type
The question is *What is the type of this artwork?*
This rendering asks information about the property [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type)
This is rendered with `This is a {artwork_type}`
- *Architecture* corresponds with `artwork_type=architecture`
- *Mural* corresponds with `artwork_type=mural`
- *Painting* corresponds with `artwork_type=painting`
- *Sculpture* corresponds with `artwork_type=sculpture`
- *Statue* corresponds with `artwork_type=statue`
- *Bust* corresponds with `artwork_type=bust`
- *Stone* corresponds with `artwork_type=stone`
- *Installation* corresponds with `artwork_type=installation`
- *Graffiti* corresponds with `artwork_type=graffiti`
- *Relief* corresponds with `artwork_type=relief`
- *Azulejo (Spanish decorative tilework)* corresponds with `artwork_type=azulejo`
- *Tilework* corresponds with `artwork_type=tilework`
- *Woodcarving* corresponds with `artwork_type=woodcarving`
This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
This tagrendering has labels `artwork-question`
### artwork-artist-wikidata
The question is *Who made this artwork?*
This rendering asks information about the property [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata)
This is rendered with `This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}`
This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
This tagrendering has labels `artwork-question`
### artwork-artist_name
The question is *Which artist created this?*
This rendering asks information about the property [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name)
This is rendered with `Created by {artist_name}`
This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
This tagrendering has labels `artwork-question`
### artwork-website
The question is *Is there a website with more information about this artwork?*
This rendering asks information about the property [website](https://wiki.openstreetmap.org/wiki/Key:website)
This is rendered with `More information on <a href='{website}' target='_blank'>this website</a>`
This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
This tagrendering has labels `artwork-question`
### artwork_subject
The question is *What does this artwork depict?*
This rendering asks information about the property [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata)
This is rendered with `This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}`
This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
This tagrendering has labels `artwork-question`
#### Filters
id | question | osmTags
---- | ---------- | ---------
bench_is_memorial.0 | is a memorial | historic=memorial\|memorial=bench
id | question | osmTags
---- | ---------- | ---------
has_backrest.0 | With and without backrest (default) |
has_backrest.1 | Has a backrest | backrest=yes
has_backrest.2 | Has no backrest | backrest=no
id | question | osmTags
---- | ---------- | ---------
has_image.0 | With and without images (default) |
has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
has_image.2 | Probably does not have an image |
This document is autogenerated from [assets/layers/bench/bench.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bench/bench.json)