Merge branch 'develop'

assets/layers/bike_shop/bike_shop.json

@@ -298,18 +298,13 @@
       },
       "id": "bike_shop-email"
     },
-    {
-      "render": "{opening_hours_table(opening_hours)}",
-      "question": "When is this shop opened?",
-      "freeform": {
-        "key": "opening_hours",
-        "type": "opening_hours"
-      },
-      "id": "bike_shop-opening_hours"
-    },
+    "opening_hours",
     "description",
     {
-      "render": "Enkel voor {access}",
+      "render": {
+        "en": "Only accessible to {access}",
+        "nl": "Enkel voor {access}"
+      },
       "freeform": {
         "key": "access"
       },

assets/layers/note/note.json

@@ -90,7 +90,7 @@
       "iconBadges": [
         {
           "if": "_total_comments>1",
-          "then": "speech_bubble"
+          "then": "circle:white;speech_bubble"
         },
         {
           "if": "_is_import_note~*",

assets/layers/playground/playground.json

@@ -346,6 +346,7 @@
         }
       ]
     },
+    "website",
     {
       "question": {
         "nl": "Wie kan men emailen indien er problemen zijn met de speeltuin?",

assets/layers/shops/shops.json

@@ -408,5 +408,41 @@
         "render": "8"
       }
     }
+  ],
+  "filter": [
+    {
+      "id": "shop-type",
+      "options": [
+        {
+          "fields": [
+            {
+              "name": "search",
+              "type": "string"
+            }
+          ],
+          "osmTags": "shop~^.*{search}.*$",
+          "question": {
+            "en": "Only show shops selling {search}"
+          }
+        }
+      ]
+    },
+    {
+      "id": "shop-name",
+      "options": [
+        {
+          "fields": [
+            {
+              "name": "search",
+              "type": "string"
+            }
+          ],
+          "osmTags": "name~^.*{search}.*$",
+          "question": {
+            "en": "Only show shops with name {search}"
+          }
+        }
+      ]
+    }
   ]
 }