From c1a25af54da0e11d0998ad56b0dec4af40008a76 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Wed, 9 Aug 2023 18:26:06 +0200
Subject: [PATCH 1/2] Add check_date, payment, allow move and delete

---
 assets/layers/questions/questions.json        | 27 +++++++++++++++++++
 .../themes/elongated_coin/elongated_coin.json | 23 +++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 3774c0a912..678b0b4024 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2174,6 +2174,33 @@
           }
         }
       ]
+    },
+    {
+      "id": "check_date",
+      "question": {
+        "en": "When was this object last checked?",
+        "de": "Wann wurde dieses Objekt zuletzt kontrolliert?",
+        "nl": "Wanneer is dit object voor het laatst gecontroleerd?"
+      },
+      "freeform": {
+        "key": "check_date",
+        "type": "date"
+      },
+      "render": {
+        "en": "This object was last checked on <b>{check_date}</b>",
+        "de": "Dieses Objekt wurde zuletzt kontrolliert am <b>{check_date}</b>",
+        "nl": "Dit object is voor het laatst gecontroleerd op <b>{check_date}</b>"
+      },
+      "mappings": [
+        {
+          "if": "check_date:={_now:date}",
+          "then": {
+            "en": "This object was last checked today",
+            "de": "Dieses Objekt wurde heute zuletzt kontrolliert",
+            "nl": "Dit object is vandaag voor het laatst gecontroleerd"
+          }
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json
index 627ce25b45..d1a97f4920 100644
--- a/assets/themes/elongated_coin/elongated_coin.json
+++ b/assets/themes/elongated_coin/elongated_coin.json
@@ -86,6 +86,21 @@
             }
           ]
         },
+        {
+          "id": "payment",
+          "builtin": "payment-options-split",
+          "override": {
+            "mappings": [
+              {},
+              {},
+              {},
+              {},
+              {
+                "hideInAnswer": true
+              }
+            ]
+          }
+        },
         {
           "id": "coin",
           "question": {
@@ -205,7 +220,8 @@
             }
           ]
         },
-        "level"
+        "level",
+        "check_date"
       ],
       "mapRendering": [
         {
@@ -235,6 +251,11 @@
           ]
         }
       ],
+      "allowMove": {
+        "enableImproveAccuracy": true,
+        "enableRelocation": true
+      },
+      "deletion": true,
       "filter": [
         "open_now"
       ]

From 8485a4af036945022317f791d4077c75d85859b7 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Wed, 9 Aug 2023 19:41:23 +0200
Subject: [PATCH 2/2] Add filters, remove override

---
 assets/layers/filters/filters.json            | 22 +++++++++++++++++++
 .../themes/elongated_coin/elongated_coin.json | 20 ++++-------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 4b1f6edadd..1f9abce814 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -55,6 +55,28 @@
         }
       ]
     },
+    {
+      "id": "accepts_debit_cards",
+      "options": [
+        {
+          "osmTags": "payment:debit_cards=yes",
+          "question": {
+            "en": "Accepts debit cards"
+          }
+        }
+      ]
+    },
+    {
+      "id": "accepts_credit_cards",
+      "options": [
+        {
+          "osmTags": "payment:credit_cards=yes",
+          "question": {
+            "en": "Accepts credit cards"
+          }
+        }
+      ]
+    },
     {
       "id": "has_image",
       "options": [
diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json
index d1a97f4920..9ad55da16f 100644
--- a/assets/themes/elongated_coin/elongated_coin.json
+++ b/assets/themes/elongated_coin/elongated_coin.json
@@ -86,21 +86,7 @@
             }
           ]
         },
-        {
-          "id": "payment",
-          "builtin": "payment-options-split",
-          "override": {
-            "mappings": [
-              {},
-              {},
-              {},
-              {},
-              {
-                "hideInAnswer": true
-              }
-            ]
-          }
-        },
+        "payment-options-split",
         {
           "id": "coin",
           "question": {
@@ -257,7 +243,9 @@
       },
       "deletion": true,
       "filter": [
-        "open_now"
+        "open_now",
+        "accepts_debit_cards",
+        "accepts_credit_cards"
       ]
     }
   ],