Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@pietervdvn
pietervdvn committed Jul 16, 2023
2 parents 02203dd + 727a4af commit 0d05256
Show file tree
Hide file tree
Showing 26 changed files with 334 additions and 8,529 deletions.
196 changes: 0 additions & 196 deletions Docs/Layers/artwork.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,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/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |
[<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) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [bench](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbench) [](https://wiki.openstreetmap.org/wiki/Tag:amenity%3D)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/backrest#values) [backrest](https://wiki.openstreetmap.org/wiki/Key:backrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno)
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/seats#values) [seats](https://wiki.openstreetmap.org/wiki/Key:seats) | [nat](../SpecialInputElements.md#nat) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/material#values) [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [metal](https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal) [stone](https://wiki.openstreetmap.org/wiki/Tag:material%3Dstone) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) [steel](https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel)
[<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/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)



Expand Down Expand Up @@ -239,194 +231,6 @@ The question is *Does this artwork serve as a bench?*



### bench-backrest



The question is *Does this bench have a backrest?*





- *This bench is two-sided and shares the backrest* corresponds with `backrest=yes&two_sided=yes`
- *Does have a backrest* corresponds with `backrest=yes`
- *Does <b>not</b> have a backrest* corresponds with `backrest=no`


This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-seats



The question is *How many seats does this bench have?*

This rendering asks information about the property [seats](https://wiki.openstreetmap.org/wiki/Key:seats)

This is rendered with `{seats} seats`





- *This bench does not have separated seats* corresponds with `seats:separated=no`


This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-material



The question is *What is the bench (seating) made from?*

This rendering asks information about the property [material](https://wiki.openstreetmap.org/wiki/Key:material)

This is rendered with `Material: {material}`





- *The seating is made from wood* corresponds with `material=wood`
- *The seating is made from metal* corresponds with `material=metal`
- *The seating is made from stone* corresponds with `material=stone`
- *The seating is made from concrete* corresponds with `material=concrete`
- *The seating is made from plastic* corresponds with `material=plastic`
- *The seating is made from steel* corresponds with `material=steel`


This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-direction



The question is *In which direction are you looking when sitting on the bench?*

This rendering asks information about the property [direction](https://wiki.openstreetmap.org/wiki/Key:direction)

This is rendered with `When sitting on the bench, one looks towards {direction}°.`



This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-colour



The question is *Which colour does this bench have?*

This rendering asks information about the property [colour](https://wiki.openstreetmap.org/wiki/Key:colour)

This is rendered with `Colour: {colour}`





- *Colour: brown* corresponds with `colour=brown`
- *Colour: green* corresponds with `colour=green`
- *Colour: gray* corresponds with `colour=gray`
- *Colour: white* corresponds with `colour=white`
- *Colour: red* corresponds with `colour=red`
- *Colour: black* corresponds with `colour=black`
- *Colour: blue* corresponds with `colour=blue`
- *Colour: yellow* corresponds with `colour=yellow`


This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-survey:date



The question is *When was this bench last surveyed?*

This rendering asks information about the property [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date)

This is rendered with `This bench was last surveyed on {survey:date}`





- *Surveyed today!* corresponds with `survey:date=`


This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### bench-inscription



The question is *Does this bench have an inscription?*

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 is only visible in the popup if the following condition is met: `amenity=bench`

This tagrendering has labels `bench-questions`



### 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: `amenity=bench`

This tagrendering has labels `bench-questions`



### leftover-questions


Expand Down
112 changes: 0 additions & 112 deletions Docs/Layers/bench.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,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/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) |



Expand Down Expand Up @@ -288,113 +283,6 @@ 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`



### leftover-questions


Expand Down
Loading

0 comments on commit 0d05256

Please sign in to comment.