Refactoring: use more accurate context in conversion, fix tests

assets/layers/charging_station/charging_station.json

@@ -4721,6 +4721,77 @@
       }
     }
   ],
+  "lineRendering": [],
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "pin",
+          "color": "#fff"
+        },
+        {
+          "icon": {
+            "render": "./assets/themes/charging_stations/plug.svg",
+            "mappings": [
+              {
+                "if": "bicycle=yes",
+                "then": "./assets/themes/charging_stations/bicycle.svg"
+              },
+              {
+                "if": {
+                  "or": [
+                    "car=yes",
+                    "motorcar=yes"
+                  ]
+                },
+                "then": "./assets/themes/charging_stations/car.svg"
+              }
+            ]
+          }
+        }
+      ],
+      "iconBadges": [
+        {
+          "if": {
+            "or": [
+              "disused:amenity=charging_station",
+              "operational_status=broken"
+            ]
+          },
+          "then": "close:#c22;"
+        },
+        {
+          "if": {
+            "or": [
+              "proposed:amenity=charging_station",
+              "planned:amenity=charging_station"
+            ]
+          },
+          "then": "./assets/layers/charging_station/under_construction.svg"
+        },
+        {
+          "if": {
+            "and": [
+              "bicycle=yes",
+              {
+                "or": [
+                  "motorcar=yes",
+                  "car=yes"
+                ]
+              }
+            ]
+          },
+          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
+        }
+      ],
+      "anchor": "bottom",
+      "iconSize": "50,50"
+    }
+  ],
   "presets": [
     {
       "tags": [
@@ -5272,40 +5343,5 @@
       ]
     },
     "neededChangesets": 10
-  },
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "pin",
-          "color": "#fff"
-        },
-        {
-          "icon": {
-            "render": "./assets/themes/charging_stations/plug.svg",
-            "mappings": [
-              {
-                "if": "bicycle=yes",
-                "then": "./assets/themes/charging_stations/bicycle.svg"
-              },
-              {
-                "if": {
-                  "or": [
-                    "car=yes",
-                    "motorcar=yes"
-                  ]
-                },
-                "then": "./assets/themes/charging_stations/car.svg"
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ],
-  "lineRendering": []
-}
+  }
+}

assets/layers/guidepost/guidepost.json

@@ -48,5 +48,6 @@
   ],
   "tagRenderings": [
     "images"
-  ]
+  ],
+  "name": "Guideposts"
 }

assets/layers/guidepost/license_info.json

@@ -19,4 +19,4 @@
       "https://wiki.openstreetmap.org/wiki/File:Signpost.jpg"
     ]
   }
-]
+]

assets/layers/vending_machine/vending_machine.json

@@ -657,7 +657,7 @@
             "nl": "Verkoop van bloemen",
             "de": "Verkauf von Blumen",
             "fr": "Vente de fleurs",
-            "ca": "Venda d'aparcament"
+            "ca": "Venda de flors"
           },
           "osmTags": "vending~i~.*flowers.*"
         },