Merge pull request #1163 from pietervdvn/RobinLinde-patch-1

Change and add questions

assets/layers/atm/atm.json

@@ -73,7 +73,100 @@
         "en": "The ATM is operated by {operator}"
       }
     },
-    "opening_hours"
+    "opening_hours",
+    {
+      "id": "cash_out",
+      "question": {
+        "en": "Can you withdraw cash from this ATM?"
+      },
+      "mappings": [
+        {
+          "if": "cash_out=",
+          "then": {
+            "en": "You can withdraw cash from this ATM"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cash_out=yes",
+          "then": {
+            "en": "You can withdraw cash from this ATM"
+          }
+        },
+        {
+          "if": "cash_out=no",
+          "then": {
+            "en": "You cannot withdraw cash from this ATM"
+          }
+        }
+      ]
+    },
+    {
+      "id": "cash_in",
+      "question": {
+        "en": "Can you deposit cash into this ATM?"
+      },
+      "mappings": [
+        {
+          "if": "cash_in=",
+          "then": {
+            "en": "You probably cannot deposit cash into this ATM"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "cash_in=yes",
+          "then": {
+            "en": "You can deposit cash into this ATM"
+          }
+        },
+        {
+          "if": "cash_in=no",
+          "then": {
+            "en": "You cannot deposit cash into this ATM"
+          }
+        }
+      ]
+    },
+    {
+      "id": "speech_output",
+      "question": {
+        "en": "Does this ATM have speech output for visually impaired users?"
+      },
+      "mappings": [
+        {
+          "if": "speech_output=yes",
+          "then": {
+            "en": "This ATM has speech output, usually available through a headphone jack"
+          }
+        },
+        {
+          "if": "speech_output=no",
+          "then": {
+            "en": "This ATM does not have speech output"
+          }
+        }
+      ]
+    },
+    {
+      "id": "speech_output_language",
+      "condition": "speech_output=yes",
+      "render": {
+        "special": {
+          "type": "language_chooser",
+          "key": "speech_output",
+          "question": {
+            "en": "In which languages does this ATM have speech output?"
+          },
+          "render_list_item": {
+            "en": "This ATM has speech output in {language():font-bold}"
+          },
+          "render_single_language": {
+            "en": "This ATM has speech output in {language():font-bold}"
+          }
+        }
+      }
+    }
   ],
   "mapRendering": [
     {
@@ -83,5 +176,19 @@
         "centroid"
       ]
     }
+  ],
+  "filter": [
+    "open_now",
+    {
+      "id": "speech_output",
+      "options": [
+        {
+          "question": {
+            "en": "With speech output"
+          },
+          "osmTags": "speech_output=yes"
+        }
+      ]
+    }
   ]
 }

assets/layers/defibrillator/defibrillator.json

@@ -23,7 +23,7 @@
     "osmTags": "emergency=defibrillator"
   },
   "calculatedTags": [
-    "_days_since_last_survey=Math.floor(new Date() - new Date(feat.properties['survey:date'])/(1000*60*60*24))",
+    "_days_since_last_survey=Math.floor((new Date() - new Date(feat.properties['survey:date']))/(1000*60*60*24))",
     "_recently_surveyed=Number(feat.properties._days_since_last_survey) <= 90"
   ],
   "minzoom": 12,

assets/layers/ticket_validator/ticket_validator.json

@@ -59,7 +59,7 @@
             "then": {
               "en": "This ticket validator accepts OV-Chipkaart"
             },
-            "hideInAnswer": "_country!=nl"
+            "hideInAnswer": true
           },
           {
             "if": "payment:ov-chipkaart=yes",
@@ -67,7 +67,7 @@
             "then": {
               "en": "This ticket validator accepts OV-Chipkaart"
             },
-            "hideInAnswer": true
+            "hideInAnswer": "_country!=nl"
           }
         ]
       }
@@ -80,6 +80,9 @@
       ],
       "title": {
         "en": "a ticket validator"
+      },
+      "description": {
+        "en": "A ticket validator to validate a public transport ticket. This can be either a digital reader, reading a card or ticket, or a machine stamping or punching a ticket."
       }
     }
   ],

assets/layers/toilet/toilet.json

@@ -233,7 +233,7 @@
       "id": "toilet-charge"
     },
     {
-      "builtin": "payment-options",
+      "builtin": "payment-options-split",
       "override": {
         "condition": "fee=yes"
       }

assets/tagRenderings/questions.json

@@ -918,7 +918,8 @@
           "ifnot": "payment:coins=no",
           "icon": "./assets/tagRenderings/coins.svg",
           "then": {
-            "en": "Coins are accepted here"
+            "en": "Coins are accepted here",
+            "nl": "Muntgeld wordt hier aanvaard"
           }
         },
         {
@@ -926,7 +927,8 @@
           "ifnot": "payment:notes=no",
           "icon": "./assets/tagRenderings/notes.svg",
           "then": {
-            "en": "Bank notes are accepted here"
+            "en": "Bank notes are accepted here",
+            "nl": "Bankbiljetten worden hier aanvaard"
           }
         },
         {
@@ -934,7 +936,8 @@
           "ifnot": "payment_debit_cards=no",
           "icon": "./assets/tagRenderings/payment_card.svg",
           "then": {
-            "en": "Debit cards are accepted here"
+            "en": "Debit cards are accepted here",
+            "nl": "Betalen met debetkaarten kan hier"
           }
         },
         {
@@ -942,7 +945,8 @@
           "ifnot": "payment:credit_cards=no",
           "icon": "./assets/tagRenderings/payment_card.svg",
           "then": {
-            "en": "Credit cards are accepted here"
+            "en": "Credit cards are accepted here",
+            "nl": "Betalen met creditkaarten kan hier"
           }
         }
       ]

langs/layers/en.json

@@ -169,6 +169,15 @@
     },
     "atm": {
         "description": "ATMS to withdraw money",
+        "filter": {
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "With speech output"
+                    }
+                }
+            }
+        },
         "name": "ATMs",
         "presets": {
             "0": {
@@ -183,6 +192,34 @@
                 "question": "What brand is this ATM?",
                 "render": "The brand of this ATM is {brand}"
             },
+            "cash_in": {
+                "mappings": {
+                    "0": {
+                        "then": "You probably cannot deposit cash into this ATM"
+                    },
+                    "1": {
+                        "then": "You can deposit cash into this ATM"
+                    },
+                    "2": {
+                        "then": "You cannot deposit cash into this ATM"
+                    }
+                },
+                "question": "Can you deposit cash into this ATM?"
+            },
+            "cash_out": {
+                "mappings": {
+                    "0": {
+                        "then": "You can withdraw cash from this ATM"
+                    },
+                    "1": {
+                        "then": "You can withdraw cash from this ATM"
+                    },
+                    "2": {
+                        "then": "You cannot withdraw cash from this ATM"
+                    }
+                },
+                "question": "Can you withdraw cash from this ATM?"
+            },
             "name": {
                 "render": "The name of this ATM is {name}"
             },
@@ -192,6 +229,26 @@
                 },
                 "question": "What company operates this ATM?",
                 "render": "The ATM is operated by {operator}"
+            },
+            "speech_output": {
+                "mappings": {
+                    "0": {
+                        "then": "This ATM has speech output, usually available through a headphone jack"
+                    },
+                    "1": {
+                        "then": "This ATM does not have speech output"
+                    }
+                },
+                "question": "Does this ATM have speech output for visually impaired users?"
+            },
+            "speech_output_language": {
+                "render": {
+                    "special": {
+                        "question": "In which languages does this ATM have speech output?",
+                        "render_list_item": "This ATM has speech output in {language():font-bold}",
+                        "render_single_language": "This ATM has speech output in {language():font-bold}"
+                    }
+                }
             }
         },
         "title": {

langs/shared-questions/nl.json

@@ -150,6 +150,24 @@
                 }
             }
         },
+        "payment-options-split": {
+            "override": {
+                "mappings+": {
+                    "0": {
+                        "then": "Muntgeld wordt hier aanvaard"
+                    },
+                    "1": {
+                        "then": "Bankbiljetten worden hier aanvaard"
+                    },
+                    "2": {
+                        "then": "Betalen met debetkaarten kan hier"
+                    },
+                    "3": {
+                        "then": "Betalen met creditkaarten kan hier"
+                    }
+                }
+            }
+        },
         "phone": {
             "question": "Wat is het telefoonnummer van {title()}?"
         },