Merge branch 'develop'

assets/layers/charging_station/charging_station.json

@@ -21,6 +21,9 @@
       ]
     }
   },
+  "keywords": {"nl": [
+    "oplaadstations","oplaad stations","oplaad punten"
+  ]},
   "title": {
     "render": {
       "en": "Charging station",
@@ -3345,4 +3348,4 @@
     },
     "neededChangesets": 10
   }
-}
+}

assets/layers/food/food.json

@@ -108,10 +108,6 @@
   "pointRendering": [
     {
       "iconBadges": [
-        {
-          "if": "opening_hours~*",
-          "then": "icons.isOpen"
-        },
         {
           "if": {
             "or": [
@@ -1046,6 +1042,12 @@
         "cs": "Má tento obchod s hranolky vegetariánské občerstvení?"
       },
       "mappings": [
+        {
+          "if": "diet:vegetarian=only",
+          "then": {
+            "en": "Serves only vegetarian snacks and burgers"
+          }
+        },
         {
           "if": "diet:vegetarian=yes",
           "then": {
@@ -1093,6 +1095,12 @@
         "cs": "Má tento obchod s hranolky veganské občerstvení?"
       },
       "mappings": [
+        {
+          "if": "diet:vegan=only",
+          "then": {
+            "en": "Servers only vegan snacks and burgers"
+          }
+        },
         {
           "if": "diet:vegan=yes",
           "then": {

assets/layers/ice_cream/ice_cream.json

@@ -38,6 +38,11 @@
         "point",
         "centroid"
       ],
+      "label": {
+        "render": "{name}",
+        "condition": "name~*"
+      },
+      "labelCssClasses": "bg-white rounded px-2",
       "marker": [
         {
           "icon": "circle",

assets/layers/shops/shops.json

@@ -153,10 +153,6 @@
         }
       ],
       "iconBadges": [
-        {
-          "if": "opening_hours~*",
-          "then": "icons.isOpen"
-        },
         {
           "if": {
             "or": [
@@ -176,11 +172,12 @@
           "then": "circle:white;./assets/layers/id_presets/fas-key.svg"
         }
       ],
+      "labelCssClasses": "bg-white rounded px-2",,
       "label": {
         "mappings": [
           {
             "if": "name~*",
-            "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+            "then": "{name}"
           }
         ]
       },