From f8ef32f123340cb9db0060cdca7f4622cd55c228 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 8 Oct 2024 14:28:56 +0200 Subject: [PATCH] Themes(food): fix vegan questions, show vegan/vegetarian badge if `=only`, fix shops layer --- assets/layers/food/food.json | 12 +++++++----- assets/layers/shops/shops.json | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 06e27483b..f54a878fc 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -112,7 +112,9 @@ "if": { "or": [ "diet:vegetarian=yes", - "diet:vegan=yes" + "diet:vegan=yes", + "diet:vegetarian=only", + "diet:vegan=only" ] }, "then": { @@ -981,9 +983,6 @@ "condition": "cuisine!=friture", "id": "halal (no friture)" }, - "sugar_free", - "gluten_free", - "lactose_free", { "id": "organic (no friture)", "question": { @@ -1098,7 +1097,7 @@ { "if": "diet:vegan=only", "then": { - "en": "Servers only vegan snacks and burgers" + "en": "Serves only vegan snacks and burgers" } }, { @@ -1276,6 +1275,9 @@ ], "condition": "cuisine=friture" }, + "sugar_free", + "gluten_free", + "lactose_free", "smoking", "service:electricity", "dog-access", diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json index aae30f25b..785fd43dc 100644 --- a/assets/layers/shops/shops.json +++ b/assets/layers/shops/shops.json @@ -172,7 +172,7 @@ "then": "circle:white;./assets/layers/id_presets/fas-key.svg" } ], - "labelCssClasses": "bg-white rounded px-2",, + "labelCssClasses": "bg-white rounded px-2", "label": { "mappings": [ {