Themes(aed): change marker size and colour based on access and opening hours

assets/layers/defibrillator/defibrillator.json

@@ -52,17 +52,109 @@
         {
           "icon": "square",
           "color": {
-            "render": "#008754",
+            "render": "#878787",
             "mappings": [
               {
-                "if": "_recently_surveyed=true",
+                "if": {
+                  "or": [
+                    "access=private",
+                    "access=no"
+                  ]
+                },
+                "then": "#876563"
+              },
+              {
+                "if": "access=customers",
+                "then": "#87763d"
+              },
+              {
+                "if": {
+                  "or": [
+                    "opening_hours=",
+                    "opening_hours=unknown",
+                    "opening_hours=closed",
+                    "opening_hours=off"
+                  ]
+                },
+                "then": "#87763d"
+              },
+              {
+                "if": {
+                  "and": [
+                    "_recently_surveyed=true",
+                    {
+                      "or": [
+                        "access=yes",
+                        "access=public",
+                        "access=permissive"
+                      ]
+                    }
+                  ]
+                },
                 "then": "#28ba3d"
+              },
+              {
+                "if": {
+                  "or": [
+                    "access=yes",
+                    "access=public",
+                    "access=permissive"
+                  ]
+                },
+                "then": "#008754"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "20,20",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    {
+                      "or": [
+                        "access=yes",
+                        "access=public",
+                        "access=permissive"
+                      ]
+                    },
+                    "opening_hours!=",
+                    "opening_hours!=unknown",
+                    "opening_hours!=closed",
+                    "opening_hours!=off"
+                  ]
+                },
+                "then": "40,40"
               }
             ]
           }
         },
         {
-          "icon": "./assets/layers/defibrillator/defibrillator.svg"
+          "icon": "./assets/layers/defibrillator/defibrillator.svg",
+          "iconSize": {
+            "#": "Keep in sync with the same code above",
+            "render": "20,20",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    {
+                      "or": [
+                        "access=yes",
+                        "access=public",
+                        "access=permissive"
+                      ]
+                    },
+                    "opening_hours!=",
+                    "opening_hours!=unknown",
+                    "opening_hours!=closed",
+                    "opening_hours!=off"
+                  ]
+                },
+                "then": "40,40"
+              }
+            ]
+          }
         }
       ],
       "location": [
@@ -671,7 +763,9 @@
   ],
   "filter": [
     "has_image",
-    "open_now"
+    "public_access",
+    "open_now",
+    "wheelchair_accessible"
   ],
   "deletion": {
     "softDeletionTags": {

assets/layers/filters/filters.json

@@ -441,7 +441,42 @@
           "osmTags": "indoor_seating=yes"
         }
       ]
+    },
+    {
+      "id": "public_access",
+      "options": [
+        {
+          "question": {
+            "en": "Open to the public",
+            "nl": "Publiek toegankelijk"
+          },
+          "osmTags": {
+            "or": [
+              "access=yes",
+              "access=public",
+              "access=permissive"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "id": "wheelchair_accessible",
+      "options": [
+        {
+          "question": {
+            "en": "Accessible to wheelchair users",
+            "nl": "Toegankelijk voor rolstoelgebruikers"
+          },
+          "osmTags": {
+            "or": [
+              "wheelchair=yes",
+              "wheelchair=designated"
+            ]
+          }
+        }
+      ]
     }
   ],
   "allowMove": false
-}
+}

langs/layers/en.json

@@ -5009,6 +5009,20 @@
                     }
                 }
             },
+            "18": {
+                "options": {
+                    "0": {
+                        "question": "Open to the public"
+                    }
+                }
+            },
+            "19": {
+                "options": {
+                    "0": {
+                        "question": "Accessible to wheelchair users"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {

langs/layers/nl.json

@@ -4796,6 +4796,20 @@
                     }
                 }
             },
+            "18": {
+                "options": {
+                    "0": {
+                        "question": "Publiek toegankelijk"
+                    }
+                }
+            },
+            "19": {
+                "options": {
+                    "0": {
+                        "question": "Toegankelijk voor rolstoelgebruikers"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {