chore: automated housekeeping...

2024-11-07 11:19:15 +01:00 · 2024-11-07 11:19:15 +01:00 · 7b792af261
commit 7b792af261
parent a2dd79c4ec
101 changed files with 2196 additions and 22043 deletions
--- a/Docs/Themes/atm.md
+++ b/Docs/Themes/atm.md
@ -54,7 +54,9 @@ Available languages:
  - [Basic tags for this layer](#basic-tags-for-this-layer)
  - [Supported attributes](#supported-attributes)
    + [images](#images)
-    + [minimap](#minimap)
+    + [phone](#phone)
+    + [email](#email)
+    + [website](#website)
    + [opening_hours](#opening_hours)
    + [Opening hours](#opening-hours)
    + [post_partner](#post_partner)
@ -171,6 +173,9 @@ Elements must match **all** of the following expressions:

 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/post_office#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/post_office/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [post_office](https://wiki.openstreetmap.org/wiki/Key:post_office) | Multiple choice | [post_partner](https://wiki.openstreetmap.org/wiki/Tag:post_office%3Dpost_partner) [](https://wiki.openstreetmap.org/wiki/Tag:post_office%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/brand#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/brand/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [nsi](../SpecialInputElements.md#nsi) |  |
@ -187,10 +192,36 @@ This block shows the known images which are linked with the `image`-keys, but al
 _This tagrendering has no question and is thus read-only_
 *{image_carousel()}{image_upload()}*

-### minimap
+### phone

-_This tagrendering has no question and is thus read-only_
-*{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }*
+The question is `What is the phone number of {title()}?`
+*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/questions/phone.svg' style='width: 3rem; height: 3rem'> *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
+
+This tagrendering has labels 
+`contact`
+
+### email
+
+The question is `What is the email address of {title()}?`
+*<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>* is shown if `email` is set
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>* is shown if with contact:email~.+. _This option cannot be chosen as answer_
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{operator:email}' target='_blank' rel='noopener'>{operator:email}</a>* is shown if with operator:email~.+. _This option cannot be chosen as answer_
+
+This tagrendering has labels 
+`contact`
+
+### website
+
+The question is `What is the website of {title()}?`
+*<a href='{website}' rel='nofollow noopener noreferrer' target='_blank'>{website}</a>* is shown if `website` is set
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/icons/website.svg' style='width: 3rem; height: 3rem'> *<a href='{contact:website}' rel='nofollow noopener noreferrer' target='_blank'>{contact:website}</a>* is shown if with contact:website~.+. _This option cannot be chosen as answer_
+
+This tagrendering has labels 
+`contact`

 ### opening_hours

--- a/Docs/Themes/blind_osm.md
+++ b/Docs/Themes/blind_osm.md
@ -14,6 +14,8 @@ This theme contains the following layers:
 - [transit_stops](../Layers/transit_stops.md)
 - [elevator](../Layers/elevator.md)
 - [stairs](../Layers/stairs.md)
+ - [tactile_map](../Layers/tactile_map.md)
+ - [tactile_model](../Layers/tactile_model.md)

 Available languages:

--- a/Docs/Themes/circular_economy.md
+++ b/Docs/Themes/circular_economy.md
@ -728,7 +728,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/climbing.md
+++ b/Docs/Themes/climbing.md
@ -756,7 +756,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/cycle_infra.md
+++ b/Docs/Themes/cycle_infra.md
@ -12,6 +12,7 @@ This theme contains the following layers:
 - [barrier](../Layers/barrier.md)
 - [crossings](../Layers/crossings.md)
 - [bicycle_counter](../Layers/bicycle_counter.md)
+ - [cyclist_waiting_aid](../Layers/cyclist_waiting_aid.md)

 Available languages:

--- a/Docs/Themes/ghostbikes.md
+++ b/Docs/Themes/ghostbikes.md
@ -33,6 +33,7 @@ Available languages:
 - ca
 - cs
 - pt
+ - uk

 # Layers defined in this theme configuration file
 These layers can not be reused in different themes.
--- a/Docs/Themes/ghostsigns.md
+++ b/Docs/Themes/ghostsigns.md
@ -543,6 +543,25 @@ This tagrendering has labels
 | artwork-artwork_type.12 | Tilework | artwork_type=tilework |
 | artwork-artwork_type.13 | Woodcarving | artwork_type=woodcarving |

+| id | question | osmTags |
+-----|-----|----- |
+| memorial-type.0 | *What type of memorial is this?* (default) |  |
+| memorial-type.1 | This is a statue | memorial=statue |
+| memorial-type.2 | This is a plaque | memorial=plaque |
+| memorial-type.3 | This is a commemorative bench | memorial=bench |
+| memorial-type.4 | This is a ghost bike - a bicycle painted white to remember a cyclist whom deceased because of a car crash | memorial=ghost_bike |
+| memorial-type.5 | This is a stolperstein (stumbing stone) | memorial=stolperstein |
+| memorial-type.6 | This is a stele | memorial=stele |
+| memorial-type.7 | This is a memorial stone | memorial=stone |
+| memorial-type.8 | This is a bust | memorial=bust |
+| memorial-type.9 | This is a sculpture | memorial=sculpture |
+| memorial-type.10 | This is an obelisk | memorial=obelisk |
+| memorial-type.11 | This is a cross | memorial=cross |
+| memorial-type.12 | This is a blue plaque | memorial=blue_plaque |
+| memorial-type.13 | This is a historic tank, permanently placed in public space as memorial | memorial=tank |
+| memorial-type.14 | This is a memorial tree | memorial=tree |
+| memorial-type.15 | This is a gravestone; the person is buried here | historic=tomb |
+


 This document is autogenerated from [assets/themes/ghostsigns/ghostsigns.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/ghostsigns/ghostsigns.json)
--- a/Docs/Themes/glutenfree.md
+++ b/Docs/Themes/glutenfree.md
@ -1521,7 +1521,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
@ -758,7 +758,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/kerbs_and_crossings.md
+++ b/Docs/Themes/kerbs_and_crossings.md
@ -38,7 +38,7 @@ Available languages:
  - [Supported attributes](#supported-attributes)
    + [images](#images)
    + [crossing-type](#crossing-type)
-    + [crossing-is-zebra](#crossing-is-zebra)
+    + [markings](#markings)
    + [crossing-bicycle-allowed](#crossing-bicycle-allowed)
    + [crossing-has-island](#crossing-has-island)
    + [crossing-tactile](#crossing-tactile)
@ -84,8 +84,8 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik

 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/crossing#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/crossing/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [crossing](https://wiki.openstreetmap.org/wiki/Key:crossing) | Multiple choice | [uncontrolled](https://wiki.openstreetmap.org/wiki/Tag:crossing%3Duncontrolled) [traffic_signals](https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dtraffic_signals) [unmarked](https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dunmarked) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/crossing_ref#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/crossing_ref/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [crossing_ref](https://wiki.openstreetmap.org/wiki/Key:crossing_ref) | Multiple choice | [zebra](https://wiki.openstreetmap.org/wiki/Tag:crossing_ref%3Dzebra) [](https://wiki.openstreetmap.org/wiki/Tag:crossing_ref%3D) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/crossing#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/crossing/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [crossing](https://wiki.openstreetmap.org/wiki/Key:crossing) | Multiple choice | [uncontrolled](https://wiki.openstreetmap.org/wiki/Tag:crossing%3Duncontrolled) [traffic_signals](https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dtraffic_signals) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/crossing:markings#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/crossing%3Amarkings/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [crossing:markings](https://wiki.openstreetmap.org/wiki/Key:crossing:markings) | [string](../SpecialInputElements.md#string) | [no](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dno) [zebra](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra) [lines](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dlines) [ladder](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder) [dashes](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Ddashes) [dots](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Ddots) [surface](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dsurface) [ladder:skewed](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder:skewed) [zebra:paired](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:paired) [zebra:bicolour](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:bicolour) [zebra:double](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:double) [pictograms](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dpictograms) [ladder:paired](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder:paired) [lines:paired](https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dlines:paired) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/bicycle#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/bicycle/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [bicycle](https://wiki.openstreetmap.org/wiki/Key:bicycle) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:bicycle%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:bicycle%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/crossing:island#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/crossing%3Aisland/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [crossing:island](https://wiki.openstreetmap.org/wiki/Key:crossing:island) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:crossing:island%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:crossing:island%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/tactile_paving#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/tactile_paving/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [tactile_paving](https://wiki.openstreetmap.org/wiki/Key:tactile_paving) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:tactile_paving%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:tactile_paving%3Dno) |
@ -109,18 +109,30 @@ The question is `What kind of crossing is this?`
 -  *Crossing, without traffic lights* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Duncontrolled' target='_blank'>uncontrolled</a>
 -  *Crossing with traffic signals* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dtraffic_signals' target='_blank'>traffic_signals</a>
 -  *Zebra crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dzebra' target='_blank'>zebra</a>. _This option cannot be chosen as answer_
- -  *Crossing without crossing markings* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dunmarked' target='_blank'>unmarked</a>
+ -  *Crossing without crossing markings* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dunmarked' target='_blank'>unmarked</a>. _This option cannot be chosen as answer_

 This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:highway' target='_blank'>highway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:highway%3Dcrossing' target='_blank'>crossing</a>

-### crossing-is-zebra
+### markings

-The question is `Is this is a zebra crossing?`
+The question is `What kind of markings does this crossing have?`
+*This crossing has {crossing:markings} markings* is shown if `crossing:markings` is set

- -  *This is a zebra crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing_ref' target='_blank'>crossing_ref</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing_ref%3Dzebra' target='_blank'>zebra</a>
- -  *This is not a zebra crossing* is shown if with crossing_ref=
-
-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Duncontrolled' target='_blank'>uncontrolled</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/crossing_unmarked.png' style='width: 3rem; height: 3rem'> *This crossing has no markings* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dno' target='_blank'>no</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_zebra.png' style='width: 3rem; height: 3rem'> *This crossing has zebra markings* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra' target='_blank'>zebra</a>
+ -  *This crossing has markings of an unknown type* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dyes' target='_blank'>yes</a>. _This option cannot be chosen as answer_
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_lines.png' style='width: 3rem; height: 3rem'> *This crossings has lines on either side of the crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dlines' target='_blank'>lines</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_ladder.png' style='width: 3rem; height: 3rem'> *This crossing has lines on either side of the crossing, along with bars connecting them* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder' target='_blank'>ladder</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_dashes.png' style='width: 3rem; height: 3rem'> *This crossing has dashed lines on either sides of the crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Ddashes' target='_blank'>dashes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_dots.png' style='width: 3rem; height: 3rem'> *This crossing has dotted lines on either sides of the crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Ddots' target='_blank'>dots</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_surface.png' style='width: 3rem; height: 3rem'> *This crossing is marked by using a different coloured surface* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dsurface' target='_blank'>surface</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_ladder_skewed.png' style='width: 3rem; height: 3rem'> *This crossing has lines on either side of the crossing, along with angled bars connecting them* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder:skewed' target='_blank'>ladder:skewed</a>
+ -  *This crossing has zebra markings with an interruption in every bar* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:paired' target='_blank'>zebra:paired</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_zebra_bicolour.png' style='width: 3rem; height: 3rem'> *This crossing has zebra markings in alternating colours* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:bicolour' target='_blank'>zebra:bicolour</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_zebra_double.png' style='width: 3rem; height: 3rem'> *This crossing has double zebra markings* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dzebra:double' target='_blank'>zebra:double</a>
+ -  *This crossing has pictograms on the road* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dpictograms' target='_blank'>pictograms</a>
+ -  *This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dladder:paired' target='_blank'>ladder:paired</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/crossings/markings_lines_paired.png' style='width: 3rem; height: 3rem'> *This crossing has double lines on either side of the crossing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:crossing:markings' target='_blank'>crossing:markings</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:markings%3Dlines:paired' target='_blank'>lines:paired</a>

 ### crossing-bicycle-allowed

--- a/Docs/Themes/lactosefree.md
+++ b/Docs/Themes/lactosefree.md
@ -1519,7 +1519,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/openlovemap.md
+++ b/Docs/Themes/openlovemap.md
@ -801,11 +801,11 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | fetish.0 | *Does this shop offer fetish gear?* (default) |  |
-| fetish.1 | This shop offers <b>soft BDSM-gear</b>, such as fluffy handcuffs, a 'fifty-shade-of-grey'-starterset, ... | fetish:bdsm:soft=yes |
-| fetish.2 | This shop offers <b>specialized BDSM-gear</b>, such as spreader bars, supplies for needle play, medical bondage supplies, impact tools, shackles, metal colors, cuffs, nipple clamps, shibari accessories, ... | fetish:bdsm:specialized=yes |
-| fetish.3 | This shop offers <b>pet play</b> accessories, such as puppy masks, animal masks, pony play, tails, hoof shoes, ... | fetish:pet_play=yes |
-| fetish.4 | This shop offers <b>leather gear</b>, including pants and shirts usable in daily life up till leather harnesses | fetish:leather=yes |
-| fetish.5 | This shop offers <b>uniforms</b> for roleplay, such nurse uniforms, military uniforms, police, school girl, french maid, ... | fetish:uniform=yes |
+| fetish.1 | This shop offers <b>soft BDSM-gear</b>, such as fluffy handcuffs, a 'fifty-shade-of-grey'-starterset, ... | fetish:bdsm:soft~^(.+;)?yes(;.+)$ |
+| fetish.2 | This shop offers <b>specialized BDSM-gear</b>, such as spreader bars, supplies for needle play, medical bondage supplies, impact tools, shackles, metal colors, cuffs, nipple clamps, shibari accessories, ... | fetish:bdsm:specialized~^(.+;)?yes(;.+)$ |
+| fetish.3 | This shop offers <b>pet play</b> accessories, such as puppy masks, animal masks, pony play, tails, hoof shoes, ... | fetish:pet_play~^(.+;)?yes(;.+)$ |
+| fetish.4 | This shop offers <b>leather gear</b>, including pants and shirts usable in daily life up till leather harnesses | fetish:leather~^(.+;)?yes(;.+)$ |
+| fetish.5 | This shop offers <b>uniforms</b> for roleplay, such nurse uniforms, military uniforms, police, school girl, french maid, ... | fetish:uniform~^(.+;)?yes(;.+)$ |

 | id | question | osmTags |
 -----|-----|----- |
@ -818,7 +818,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/personal.md
+++ b/Docs/Themes/personal.md
@ -44,6 +44,7 @@ This theme contains the following layers:
 - [crossings](../Layers/crossings.md)
 - [current_view](../Layers/current_view.md)
 - [cycleways_and_roads](../Layers/cycleways_and_roads.md)
+ - [cyclist_waiting_aid](../Layers/cyclist_waiting_aid.md)
 - [defibrillator](../Layers/defibrillator.md)
 - [dentist](../Layers/dentist.md)
 - [disaster_response](../Layers/disaster_response.md)
@ -119,6 +120,8 @@ This theme contains the following layers:
 - [stairs](../Layers/stairs.md)
 - [street_lamps](../Layers/street_lamps.md)
 - [surveillance_camera](../Layers/surveillance_camera.md)
+ - [tactile_map](../Layers/tactile_map.md)
+ - [tactile_model](../Layers/tactile_model.md)
 - [tertiary_education](../Layers/tertiary_education.md)
 - [ticket_machine](../Layers/ticket_machine.md)
 - [toilet](../Layers/toilet.md)
--- a/Docs/Themes/pets.md
+++ b/Docs/Themes/pets.md
@ -1306,7 +1306,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |
--- a/Docs/Themes/postboxes.md
+++ b/Docs/Themes/postboxes.md
@ -12,6 +12,7 @@ This theme contains the following layers:
 - [postoffices](../Layers/postoffices.md)
 - [parcel_lockers](../Layers/parcel_lockers.md)
 - [shops](../Layers/shops.md)
+ - [walls_and_buildings](../Layers/walls_and_buildings.md)

 Available languages:

--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@ -745,7 +745,7 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
+| shop_types.1 | Bicycle rental shop | shop=bicycle_rental | ((shop=rental & amenity=bicycle_rental)) |
 | shop_types.2 | Farm Supply Shop | shop=agrarian |
 | shop_types.3 | Liquor Store | shop=alcohol |
 | shop_types.4 | Anime / Manga Shop | shop=anime |