Merge branch 'master' into develop

assets/themes/food/food.json

@@ -30,7 +30,8 @@
   },
   "icon": "./assets/layers/food/restaurant.svg",
   "layers": [
-    "food"
+    "food",
+    "ice_cream"
   ],
   "widenFactor": 3
-}
+}

assets/themes/fritures/fritures.json

@@ -56,7 +56,32 @@
               }
             ]
           }
-        }
+        },
+        "filter+": [
+          {
+            "id": "oil-type",
+            "options": [
+              {
+                "question": {
+                  "en": "No oil type preference"
+                }
+              },
+              {
+                "question": {
+                  "en": "Only show fritures using vegetable oil"
+                },
+                "osmTags": "friture:oil=vegetable"
+              },
+              {
+                "question": {
+                  "en": "Only show fritures using animal oil"
+                },
+                "osmTags": "friture:oil=animal"
+                
+              }
+            ]
+          }
+        ]
       }
     },
     {
@@ -69,4 +94,4 @@
     }
   ],
   "widenFactor": 3
-}
+}