Merge develop

Docs/Layers/bicycle_tube_vending_machine.md

@@ -51,6 +51,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/brand#values) [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) | [Continental](https://wiki.openstreetmap.org/wiki/Tag:brand%3DContinental) [Schwalbe](https://wiki.openstreetmap.org/wiki/Tag:brand%3DSchwalbe)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [Schwalbe](https://wiki.openstreetmap.org/wiki/Tag:operator%3DSchwalbe) [Continental](https://wiki.openstreetmap.org/wiki/Tag:operator%3DContinental)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | Multiple choice | [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [bicycle_light](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_light) [gloves](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dgloves) [bicycle_repair_kit](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_repair_kit) [bicycle_pump](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_pump) [bicycle_lock](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_lock)
 
 
 
@@ -121,22 +122,32 @@ This is rendered with  `A bicycle tube costs {charge}`
 
 
 
-### vending-machine-payment-methods 
+### payment-options-split 
 
 
 
-The question is  *How can one pay at this tube vending machine?*
+The question is  *Which methods of payment are accepted here?*
 
 
 
 
 
-  - *Payment with coins is possible*  corresponds with  `payment:coins=yes`
+  - *Cash is accepted here*  corresponds with  `payment:cash=yes`
+  - This option cannot be chosen as answer
+  - Unselecting this answer will add 
+  - *Payment cards are accepted here*  corresponds with  `payment:cards=yes`
+  - This option cannot be chosen as answer
+  - Unselecting this answer will add 
+  - *Payment by QR-code is possible here*  corresponds with  `payment:qr_code=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:qr_code' target='_blank'>payment:qr_code</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:qr_code%3Dno' target='_blank'>no</a>
+  - *Coins are accepted here*  corresponds with  `payment:coins=yes`
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:coins' target='_blank'>payment:coins</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:coins%3Dno' target='_blank'>no</a>
-  - *Payment with notes is possible*  corresponds with  `payment:notes=yes`
+  - *Bank notes are accepted here*  corresponds with  `payment:notes=yes`
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:notes' target='_blank'>payment:notes</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:notes%3Dno' target='_blank'>no</a>
-  - *Payment with cards is possible*  corresponds with  `payment:cards=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
+  - *Debit cards are accepted here*  corresponds with  `payment:debit_cards=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:debit_cards' target='_blank'>payment:debit_cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:debit_cards%3Dno' target='_blank'>no</a>
+  - *Credit cards are accepted here*  corresponds with  `payment:credit_cards=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:credit_cards' target='_blank'>payment:credit_cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:credit_cards%3Dno' target='_blank'>no</a>
 
 
 
@@ -181,26 +192,22 @@ This is rendered with  `This vending machine is maintained by {operator}`
 
 
 
-### bicycle_tube_vending_maching-other-items 
+### other-items-vending 
 
 
 
-The question is  *Are other bicycle bicycle accessories sold here?*
+The question is  *Are other biycle accessories sold here?*
 
 
 
 
 
-  - *Bicycle lights are sold here*  corresponds with  `vending:bicycle_light=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:vending:bicycle_light' target='_blank'>vending:bicycle_light</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:vending:bicycle_light%3Dno' target='_blank'>no</a>
-  - *Gloves are sold here*  corresponds with  `vending:gloves=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:vending:gloves' target='_blank'>vending:gloves</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:vending:gloves%3Dno' target='_blank'>no</a>
-  - *Bicycle repair kits are sold here*  corresponds with  `vending:bicycle_repair_kit=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:vending:bicycle_repair_kit' target='_blank'>vending:bicycle_repair_kit</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:vending:bicycle_repair_kit%3Dno' target='_blank'>no</a>
-  - *Bicycle pumps are sold here*  corresponds with  `vending:bicycle_pump=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:vending:bicycle_pump' target='_blank'>vending:bicycle_pump</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:vending:bicycle_pump%3Dno' target='_blank'>no</a>
-  - *Bicycle locks are sold here*  corresponds with  `vending:bicycle_lock=yes`
-  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:vending:bicycle_lock' target='_blank'>vending:bicycle_lock</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:vending:bicycle_lock%3Dno' target='_blank'>no</a>
+  - *Bicycle inner tubes are sold here*  corresponds with  `vending=bicycle_tube`
+  - *Bicycle lights are sold here*  corresponds with  `vending=bicycle_light`
+  - *Gloves are sold here*  corresponds with  `vending=gloves`
+  - *Bicycle repair kits are sold here*  corresponds with  `vending=bicycle_repair_kit`
+  - *Bicycle pumps are sold here*  corresponds with  `vending=bicycle_pump`
+  - *Bicycle locks are sold here*  corresponds with  `vending=bicycle_lock`