Refactoring: further cleanup of the themes

Logic/ExtraFunctions.ts

@@ -259,14 +259,6 @@ class ClosestNObjectFunc implements ExtraFunction {
         const maxDistance = options?.maxDistance ?? 500
         const uniqueTag: string | undefined = options?.uniqueTag
         let allFeatures: Feature[][]
-        console.log(
-            "Calculating closest",
-            options?.maxFeatures,
-            "features around",
-            feature,
-            "in layer",
-            features
-        )
         if (typeof features === "string") {
             const name = features
             const bbox = GeoOperations.bbox(

Models/ThemeConfig/Conversion/LegacyJsonConvert.ts

@@ -147,13 +147,25 @@ export class UpdateLegacyLayer extends DesugaringStep<
             const pr = <PointRenderingConfigJson>rendering
             const iconSize = pr.iconSize
             if (typeof iconSize === "string")
-                if (["bottom", "center", "top"].some((a) => (<string>iconSize).endsWith("," + a))) {
+                if (["bottom", "center", "top"].some((a) => (<string>iconSize).endsWith(a))) {
                     const parts = iconSize.split(",").map((parts) => parts.toLowerCase().trim())
                     pr.anchor = parts.pop()
                     pr.iconSize = parts.join(",")
                 }
         }
 
+        for (const rendering of config.mapRendering) {
+            for (const key in rendering) {
+                if (
+                    typeof rendering[key]["render"] === "string" &&
+                    Object.keys(rendering[key]).length === 1
+                ) {
+                    console.log("Rewrite: ", rendering[key])
+                    rendering[key] = rendering[key]["render"]
+                }
+            }
+        }
+
         return {
             result: config,
             errors: [],

Models/ThemeConfig/WithContextLoader.ts

@@ -32,6 +32,12 @@ export default class WithContextLoader {
                 return shared
             }
         }
+        if (Object.keys(v).length === 1 && typeof v["render"] === "string") {
+            throw `At ${
+                translationContext ?? "<unknown>"
+            }: use the content directly instead of {${key}: ${JSON.stringify(v)}}`
+        }
+
         return new TagRenderingConfig(v, `${translationContext ?? this._context}.${key}`)
     }
 

UI/i18n/Translation.ts

@@ -34,7 +34,9 @@ export class Translation extends BaseUIElement {
                 console.error(
                     "Non-string object at",
                     context,
-                    "in translation: ",
+                    `for language`,
+                    translationsKey,
+                    `in translation: `,
                     translations[translationsKey],
                     "\n    current translations are: ",
                     translations

assets/layers/address/address.json

@@ -297,9 +297,7 @@
           }
         ]
       },
-      "width": {
-        "render": "8"
-      }
+      "width": "8"
     }
   ]
 }

assets/layers/advertising/advertising.json

@@ -971,30 +971,31 @@
         ]
       },
       "iconSize": {
-        "render": "40,40,bottom",
+        "render": "40,40",
         "mappings": [
-          {
-            "if": "_referencing_ways~*",
-            "then": "40,40,center"
-          },
           {
             "if": "advertising=flag",
-            "then": "60,60,bottom"
+            "then": "60,60"
           },
           {
             "if": "advertising=sculpture",
-            "then": "50,50,bottom"
+            "then": "50,50"
+          }
+        ]
+      },
+      "anchor": {
+        "render": "bottom",
+        "mappings": [
+          {
+            "if": "_referencing_ways~*",
+            "then": "center"
           }
         ]
       }
     },
     {
-      "width": {
-        "render": "8"
-      },
-      "color": {
-        "render": "#00f"
-      }
+      "width": "8",
+      "color": "#00f"
     }
   ],
   "allowMove": {

assets/layers/ambulancestation/ambulancestation.json

@@ -361,24 +361,16 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "icon": "./assets/themes/hailhydrant/Twemoji_1f691.svg",
+      "iconSize": "35,35,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#00f",
+      "width": "1"
     }
   ]
 }

assets/layers/artwork/artwork.json

@@ -728,21 +728,15 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/artwork/artwork.svg"
-      },
+      "icon": "./assets/themes/artwork/artwork.svg",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#0000ff"
-      },
-      "width": {
-        "render": "10"
-      }
+      "color": "#0000ff",
+      "width": "10"
     }
   ],
   "filter": [

assets/layers/bench/bench.json

@@ -996,12 +996,8 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/bench/bench.svg"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "icon": "./assets/layers/bench/bench.svg",
+      "iconSize": "35,35,center",
       "iconBadges": [
         {
           "if": "tourism=artwork",

assets/layers/bench_at_pt/bench_at_pt.json

@@ -203,23 +203,15 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/benches/bench_public_transport.svg"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "icon": "./assets/themes/benches/bench_public_transport.svg",
+      "iconSize": "35,35,center",
       "location": [
         "point"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ],
   "deletion": {

assets/layers/bicycle_library/bicycle_library.json

@@ -327,9 +327,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg"
-      },
+      "icon": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg",
       "iconBadges": [
         {
           "if": "opening_hours~*",
@@ -340,21 +338,15 @@
           "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
         }
       ],
-      "iconSize": {
-        "render": "50,50,bottom"
-      },
+      "iconSize": "50,50,bottom",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#c00"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#c00",
+      "width": "1"
     }
   ],
   "deletion": true

assets/layers/bicycle_rental/bicycle_rental.json

@@ -528,21 +528,15 @@
   "mapRendering": [
     {
       "icon": "./assets/themes/bicycle_rental/logo.svg",
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#3333aa88"
-      },
-      "width": {
-        "render": "2"
-      }
+      "color": "#3333aa88",
+      "width": "2"
     }
   ],
   "allowMove": {

assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json

@@ -290,9 +290,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
-      },
+      "icon": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg",
       "iconBadges": [
         {
           "if": {

assets/layers/bike_cafe/bike_cafe.json

@@ -340,24 +340,17 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#684c2b;./assets/layers/bike_cafe/bike_cafe.svg"
-      },
-      "iconSize": {
-        "render": "50,50,bottom"
-      },
+      "icon": "pin:#684c2b;./assets/layers/bike_cafe/bike_cafe.svg",
+      "iconSize": "50,50",
+      "anchor": "bottom",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#694E2D"
-      },
-      "width": {
-        "render": "2"
-      }
+      "color": "#694E2D",
+      "width": "2"
     }
   ],
   "description": {

assets/layers/bike_cleaning/bike_cleaning.json

@@ -239,9 +239,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
-      },
+      "icon": "./assets/layers/bike_cleaning/bike_cleaning.svg",
       "iconBadges": [
         {
           "if": {

assets/layers/bike_parking/bike_parking.json

@@ -696,9 +696,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#5473de;./assets/layers/bike_parking/parking.svg"
-      },
+      "icon": "pin:#5473de;./assets/layers/bike_parking/parking.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/bike_repair_station/bike_repair_station.json

@@ -1040,9 +1040,7 @@
           "then": "invalid"
         }
       ],
-      "iconSize": {
-        "render": "50,50,bottom"
-      },
+      "iconSize": "50,50,bottom",
       "location": [
         "point",
         "centroid"

assets/layers/bike_shop/bike_shop.json

@@ -827,31 +827,20 @@
           "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
         },
         {
-          "if": {
-            "and": [
-              "service:bicycle:cleaning~*"
-            ]
-          },
-          "then": {
-            "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
-          }
+          "if": "service:bicycle:cleaning~*",
+          "then": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
         }
       ],
-      "iconSize": {
-        "render": "50,50,bottom"
-      },
+      "iconSize": "50,50",
+      "anchor": "bottom",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#c00"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#c00",
+      "width": "1"
     }
   ],
   "filter": [

assets/layers/bike_themed_object/bike_themed_object.json

@@ -69,24 +69,16 @@
   "presets": [],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/bike_themed_object/other_services.svg"
-      },
-      "iconSize": {
-        "render": "50,50,bottom"
-      },
+      "icon": "./assets/layers/bike_themed_object/other_services.svg",
+      "iconSize": "50,50,bottom",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#AB76D5"
-      },
-      "width": {
-        "render": "2"
-      }
+      "color": "#AB76D5",
+      "width": "2"
     }
   ],
   "description": {

assets/layers/binocular/binocular.json

@@ -158,23 +158,15 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/binocular/telescope.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "circle:white;./assets/layers/binocular/telescope.svg",
+      "iconSize": "40,40,center",
       "location": [
         "point"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ]
 }

assets/layers/charging_station/charging_station.json

@@ -4016,9 +4016,7 @@
           "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
         }
       ],
-      "iconSize": {
-        "render": "50,50,bottom"
-      }
+      "iconSize": "50,50,bottom"
     }
   ],
   "presets": [

assets/layers/climbing_area/climbing_area.json

@@ -298,12 +298,8 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/climbing/climbing_no_rope.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "./assets/themes/climbing/climbing_no_rope.svg",
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/climbing_club/climbing_club.json

@@ -161,18 +161,14 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/climbing/club.svg"
-      },
+      "icon": "./assets/themes/climbing/club.svg",
       "iconBadges": [
         {
           "if": "opening_hours~*",
           "then": "icons.isOpen"
         }
       ],
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/climbing_gym/climbing_gym.json

@@ -236,18 +236,14 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/climbing/climbing_gym.svg"
-      },
+      "icon": "./assets/themes/climbing/climbing_gym.svg",
       "iconBadges": [
         {
           "if": "opening_hours~*",
           "then": "icons.isOpen"
         }
       ],
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/climbing_opportunity/climbing_opportunity.json

@@ -128,12 +128,8 @@
       ]
     },
     {
-      "color": {
-        "render": "#ddff55AA"
-      },
-      "width": {
-        "render": "2"
-      }
+      "color": "#ddff55AA",
+      "width": "2"
     }
   ]
 }

assets/layers/climbing_route/climbing_route.json

@@ -218,12 +218,8 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/themes/climbing/climbing_route.svg"
-      },
-      "iconSize": {
-        "render": "28,28,center"
-      },
+      "icon": "circle:white;./assets/themes/climbing/climbing_route.svg",
+      "iconSize": "28,28,center",
       "location": [
         "point",
         "centroid"
@@ -247,12 +243,8 @@
       }
     },
     {
-      "color": {
-        "render": "#0f0"
-      },
-      "width": {
-        "render": "4"
-      }
+      "color": "#0f0",
+      "width": "4"
     }
   ]
 }

assets/layers/crab_address/crab_address.json

@@ -17,9 +17,7 @@
       ],
       "iconSize": "50,50",
       "icon": "./assets/layers/crab_address/housenumber_blank.svg",
-      "label": {
-        "render": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{_HNRLABEL}</div>"
-      },
+      "label": "<div style='margin-top: -42px; color: white' class='rounded-full p-1 font-bold relative'>{_HNRLABEL}</div>",
       "anchor": "center"
     }
   ],

assets/layers/cycleways_and_roads/cycleways_and_roads.json

@@ -1610,12 +1610,8 @@
   "allowSplit": true,
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/cycle_infra/bicycleway.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "./assets/themes/cycle_infra/bicycleway.svg",
+      "iconSize": "40,40",
       "location": [
         "point"
       ]
@@ -1654,9 +1650,7 @@
           }
         ]
       },
-      "width": {
-        "render": "8"
-      },
+      "width": "8",
       "dashArray": {
         "render": "",
         "mappings": [

assets/layers/dentist/dentist.json

@@ -67,9 +67,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/dentist/dentist.svg"
-      },
+      "icon": "circle:white;./assets/layers/dentist/dentist.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/direction/direction.json

@@ -40,9 +40,7 @@
         "point",
         "centroid"
       ],
-      "rotation": {
-        "render": "{_direction:numerical}deg"
-      },
+      "rotation": "{_direction:numerical}deg",
       "anchor": "center"
     },
     {

assets/layers/doctors/doctors.json

@@ -126,9 +126,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/doctors/doctors.svg"
-      },
+      "icon": "circle:white;./assets/layers/doctors/doctors.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/drinking_water/drinking_water.json

@@ -244,9 +244,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg"
-      },
+      "icon": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg",
       "iconBadges": [
         {
           "if": {

assets/layers/elevator/elevator.json

@@ -191,9 +191,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg"
-      },
+      "icon": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/etymology/etymology.json

@@ -273,9 +273,7 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point"
       ]

assets/layers/extinguisher/extinguisher.json

@@ -155,12 +155,8 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
-      },
-      "iconSize": {
-        "render": "20,20,center"
-      },
+      "icon": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg",
+      "iconSize": "20,20,center",
       "location": [
         "point",
         "centroid"

assets/layers/fire_station/fire_station.json

@@ -297,24 +297,16 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "icon": "./assets/themes/hailhydrant/Twemoji12_1f692.svg",
+      "iconSize": "35,35,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#c22"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#c22",
+      "width": "1"
     }
   ]
 }

assets/layers/governments/governments.json

@@ -64,9 +64,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/governments/government.svg"
-      },
+      "icon": "circle:white;./assets/layers/governments/government.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/gps_track/gps_track.json

@@ -4,7 +4,9 @@
   "minzoom": 0,
   "source": "special",
   "title": {
-    "render": "Your travelled path"
+    "render": {
+      "en": "Your travelled path"
+    }
   },
   "shownByDefault": false,
   "tagRenderings": [

assets/layers/hackerspace/hackerspace.json

@@ -334,21 +334,15 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ],
   "allowMove": true,

assets/layers/home_location/home_location.json

@@ -5,12 +5,8 @@
   "source": "special",
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/svg/home.svg"
-      },
-      "iconSize": {
-        "render": "20,20,center"
-      },
+      "icon": "circle:white;./assets/svg/home.svg",
+      "iconSize": "20,20",
       "location": [
         "point",
         "centroid"

assets/layers/hospital/hospital.json

@@ -112,9 +112,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/hospital/hospital.svg"
-      },
+      "icon": "circle:white;./assets/layers/hospital/hospital.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/hydrant/hydrant.json

@@ -492,24 +492,16 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/hailhydrant/hydrant.svg"
-      },
-      "iconSize": {
-        "render": "20,20,center"
-      },
+      "icon": "./assets/themes/hailhydrant/hydrant.svg",
+      "iconSize": "20,20,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ],
   "units": [

assets/layers/indoors/indoors.json

@@ -151,15 +151,9 @@
   ],
   "mapRendering": [
     {
-      "color": {
-        "render": "#d3d7d588"
-      },
-      "width": {
-        "render": "8"
-      },
-      "offset": {
-        "render": "-4"
-      },
+      "color": "#d3d7d588",
+      "width": "8",
+      "offset": "-4",
       "fill": "no"
     },
     {

assets/layers/information_board/information_board.json

@@ -68,20 +68,14 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/information_board/board.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "./assets/layers/information_board/board.svg",
+      "iconSize": "40,40,center",
       "location": [
         "point"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      }
+      "color": "#00f"
     }
   ],
   "description": {

assets/layers/map/map.json

@@ -264,21 +264,15 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "50,50,center"
-      },
+      "iconSize": "50,50,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ]
 }

assets/layers/maxspeed/maxspeed.json

@@ -130,9 +130,7 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "32,32,center"
-      },
+      "iconSize": "32,32,center",
       "location": [
         "point",
         "projected_centerpoint"
@@ -148,9 +146,7 @@
           }
         ]
       },
-      "width": {
-        "render": "3"
-      }
+      "width": "3"
     }
   ],
   "units": [

assets/layers/named_streets/named_streets.json

@@ -12,12 +12,8 @@
   },
   "mapRendering": [
     {
-      "color": {
-        "render": "#ccc"
-      },
-      "width": {
-        "render": "3"
-      }
+      "color": "#ccc",
+      "width": "3"
     }
   ],
   "shownByDefault": false

assets/layers/nature_reserve/nature_reserve.json

@@ -527,24 +527,16 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/nature_reserve/nature_reserve.svg"
-      },
-      "iconSize": {
-        "render": "50,50,center"
-      },
+      "icon": "./assets/layers/nature_reserve/nature_reserve.svg",
+      "iconSize": "50,50,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#3c3"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#3c3",
+      "width": "1"
     }
   ]
 }

assets/layers/observation_tower/observation_tower.json

@@ -316,12 +316,8 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/observation_tower/Tower_observation.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "circle:white;./assets/layers/observation_tower/Tower_observation.svg",
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/osm_community_index/osm_community_index.json

@@ -37,9 +37,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "pin:#6BC4F7;./assets/layers/osm_community_index/osm.svg"
-      },
+      "icon": "pin:#6BC4F7;./assets/layers/osm_community_index/osm.svg",
       "iconSize": "40,40",
       "location": [
         "point"
@@ -48,9 +46,7 @@
     },
     {
       "color": "#444444",
-      "width": {
-        "render": "1"
-      }
+      "width": "1"
     }
   ],
   "filter": [

assets/layers/parking/parking.json

@@ -257,12 +257,8 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/parking/parking.svg"
-      },
-      "iconSize": {
-        "render": "36,36,center"
-      },
+      "icon": "./assets/layers/parking/parking.svg",
+      "iconSize": "36,36,center",
       "location": [
         "point",
         "centroid"

assets/layers/pharmacy/pharmacy.json

@@ -113,9 +113,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/pharmacy/pharmacy.svg"
-      },
+      "icon": "./assets/layers/pharmacy/pharmacy.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/physiotherapist/physiotherapist.json

@@ -62,9 +62,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:white;./assets/layers/physiotherapist/doctors.svg"
-      },
+      "icon": "circle:white;./assets/layers/physiotherapist/doctors.svg",
       "iconSize": "40,40",
       "location": [
         "point",

assets/layers/picnic_table/picnic_table.json

@@ -131,12 +131,8 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "icon": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg",
+      "iconSize": "35,35,center",
       "location": [
         "point",
         "centroid"

assets/layers/play_forest/play_forest.json

@@ -109,9 +109,7 @@
   "mapRendering": [
     {
       "icon": "./assets/layers/play_forest/icon.svg",
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/playground/playground.json

@@ -596,9 +596,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/playgrounds/playground.svg"
-      },
+      "icon": "./assets/themes/playgrounds/playground.svg",
       "iconBadges": [
         {
           "if": {
@@ -637,12 +635,8 @@
       ]
     },
     {
-      "color": {
-        "render": "#5dbaa9"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#5dbaa9",
+      "width": "1"
     }
   ]
 }

assets/layers/postboxes/postboxes.json

@@ -79,24 +79,16 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/postboxes/postbox.svg"
-      },
-      "iconSize": {
-        "render": "40,40,bottom"
-      },
+      "icon": "./assets/layers/postboxes/postbox.svg",
+      "iconSize": "40,40,bottom",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#DADADA"
-      },
-      "width": {
-        "render": "1"
-      }
+      "color": "#DADADA",
+      "width": "1"
     }
   ]
 }

assets/layers/postoffices/postoffices.json

@@ -433,9 +433,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "square:white;./assets/layers/postoffices/post_office.svg"
-      },
+      "icon": "square:white;./assets/layers/postoffices/post_office.svg",
       "iconBadges": [
         {
           "if": "opening_hours~*",

assets/layers/public_bookcase/public_bookcase.json

@@ -522,9 +522,7 @@
   ],
   "mapRendering": [
     {
-      "icon": {
-        "render": "circle:#ffffff;./assets/themes/bookcases/bookcase.svg"
-      },
+      "icon": "circle:#ffffff;./assets/themes/bookcases/bookcase.svg",
       "label": {
         "mappings": [
           {
@@ -539,12 +537,8 @@
       ]
     },
     {
-      "color": {
-        "render": "#0000ff"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#0000ff",
+      "width": "8"
     }
   ]
 }

assets/layers/school/school.json

@@ -388,9 +388,7 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/shops/shops.json

@@ -360,21 +360,15 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ],
   "filter": [

assets/layers/slow_roads/slow_roads.json

@@ -253,12 +253,8 @@
       ]
     },
     {
-      "color": {
-        "render": "#eaba2a"
-      },
-      "width": {
-        "render": "7"
-      },
+      "color": "#eaba2a",
+      "width": "7",
       "dashArray": {
         "render": "",
         "mappings": [

assets/layers/surveillance_camera/surveillance_camera.json

@@ -647,12 +647,8 @@
       }
     },
     {
-      "color": {
-        "render": "#f00"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#f00",
+      "width": "8"
     }
   ],
   "deletion": true,

assets/layers/tertiary_education/tertiary_education.json

@@ -169,9 +169,7 @@
         "point",
         "centroid"
       ],
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40,center",
       "label": {
         "mappings": [
           {

assets/layers/trail/trail.json

@@ -222,9 +222,7 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "35,35,center"
-      },
+      "iconSize": "35,35,center",
       "location": [
         "point"
       ]
@@ -239,12 +237,8 @@
           }
         ]
       },
-      "width": {
-        "render": "3"
-      },
-      "dashArray": {
-        "render": "5 5"
-      }
+      "width": "3",
+      "dashArray": "5 5"
     }
   ]
 }

assets/layers/tree_node/tree_node.json

@@ -846,9 +846,7 @@
           }
         ]
       },
-      "iconSize": {
-        "render": "40,40,bottom"
-      },
+      "iconSize": "40,40,bottom",
       "location": [
         "point",
         "centroid"

assets/layers/visitor_information_centre/visitor_information_centre.json

@@ -76,12 +76,8 @@
   "presets": [],
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/layers/visitor_information_centre/information.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "icon": "./assets/layers/visitor_information_centre/information.svg",
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"

assets/layers/walls_and_buildings/walls_and_buildings.json

@@ -34,22 +34,14 @@
   "shownByDefault": false,
   "mapRendering": [
     {
-      "color": {
-        "render": "#fff"
-      },
+      "color": "#fff",
       "fill": "no",
-      "width": {
-        "render": "3"
-      }
+      "width": "3"
     },
     {
-      "color": {
-        "render": "#333"
-      },
+      "color": "#333",
       "fill": "no",
-      "width": {
-        "render": "2"
-      }
+      "width": "2"
     }
   ],
   "calculatedTags": [

assets/layers/waste_basket/waste_basket.json

@@ -376,9 +376,7 @@
   },
   "mapRendering": [
     {
-      "icon": {
-        "render": "./assets/themes/waste_basket/waste_basket.svg"
-      },
+      "icon": "./assets/themes/waste_basket/waste_basket.svg",
       "iconSize": {
         "render": "40,40,center",
         "mappings": [
@@ -408,12 +406,8 @@
       ]
     },
     {
-      "color": {
-        "render": "#00f"
-      },
-      "width": {
-        "render": "8"
-      }
+      "color": "#00f",
+      "width": "8"
     }
   ]
 }

assets/themes/buurtnatuur/buurtnatuur.json

@@ -91,12 +91,8 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
-          },
-          "iconSize": {
-            "render": "50,50,center"
-          },
+          "icon": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg",
+          "iconSize": "50,50,center",
           "location": [
             "point"
           ]
@@ -129,9 +125,7 @@
               }
             ]
           },
-          "width": {
-            "render": "5"
-          }
+          "width": "5"
         }
       ]
     },
@@ -203,12 +197,8 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "icon": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg",
+          "iconSize": "40,40,center",
           "location": [
             "point"
           ]
@@ -228,9 +218,7 @@
               }
             ]
           },
-          "width": {
-            "render": "5"
-          }
+          "width": "5"
         }
       ]
     },
@@ -303,12 +291,8 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "icon": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg",
+          "iconSize": "40,40,center",
           "location": [
             "point"
           ]
@@ -346,9 +330,7 @@
               }
             ]
           },
-          "width": {
-            "render": "5"
-          }
+          "width": "5"
         }
       ]
     },

assets/themes/campersite/campersite.json

@@ -872,21 +872,15 @@
               }
             ]
           },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "iconSize": "40,40,center",
           "location": [
             "point",
             "centroid"
           ]
         },
         {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "8"
-          }
+          "color": "#00f",
+          "width": "8"
         }
       ]
     },
@@ -1453,23 +1447,15 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
-          },
-          "iconSize": {
-            "render": "32,32,center"
-          },
+          "icon": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg",
+          "iconSize": "32,32,center",
           "location": [
             "point"
           ]
         },
         {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "8"
-          }
+          "color": "#00f",
+          "width": "8"
         }
       ]
     }

assets/themes/cycle_highways/cycle_highways.json

@@ -243,9 +243,7 @@
               }
             ]
           },
-          "width": {
-            "render": "4"
-          },
+          "width": "4",
           "dashArray": {
             "render": "",
             "mappings": [

assets/themes/cyclenodes/cyclenodes.json

@@ -79,12 +79,8 @@
       },
       "mapRendering": [
         {
-          "width": {
-            "render": "4"
-          },
-          "color": {
-            "render": "#00a703"
-          }
+          "width": "4",
+          "color": "#00a703"
         }
       ],
       "tagRenderings": [

assets/themes/facadegardens/facadegardens.json

@@ -600,9 +600,7 @@
               "then": "circle:white;./assets/themes/facadegardens/bloei.svg"
             }
           ],
-          "iconSize": {
-            "render": "50,50,center"
-          },
+          "iconSize": "50,50,center",
           "location": [
             "point",
             "centroid"

assets/themes/fruit_trees/fruit_trees.json

@@ -53,23 +53,15 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "./assets/themes/buurtnatuur/forest.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "icon": "./assets/themes/buurtnatuur/forest.svg",
+          "iconSize": "40,40,center",
           "location": [
             "point"
           ]
         },
         {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "8"
-          }
+          "color": "#00f",
+          "width": "8"
         }
       ]
     },
@@ -164,23 +156,15 @@
       ],
       "mapRendering": [
         {
-          "icon": {
-            "render": "./assets/themes/fruit_trees/fruit_tree.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "icon": "./assets/themes/fruit_trees/fruit_tree.svg",
+          "iconSize": "40,40,center",
           "location": [
             "point"
           ]
         },
         {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "8"
-          }
+          "color": "#00f",
+          "width": "8"
         }
       ]
     }

assets/themes/grb/grb.json

@@ -579,12 +579,8 @@
       },
       "mapRendering": [
         {
-          "color": {
-            "render": "#ccc"
-          },
-          "width": {
-            "render": "1"
-          },
+          "color": "#ccc",
+          "width": "1",
           "fill": "no"
         }
       ],

assets/themes/grb_fixme/grb_fixme.json

@@ -93,9 +93,7 @@
               }
             ]
           },
-          "iconSize": {
-            "render": "40,40,center"
-          }
+          "iconSize": "40,40,center"
         }
       ],
       "title": "OSM-gebouw",

assets/themes/postal_codes/postal_codes.json

@@ -124,12 +124,8 @@
           ]
         },
         {
-          "color": {
-            "render": "#00f"
-          },
-          "width": {
-            "render": "4"
-          },
+          "color": "#00f",
+          "width": "4",
           "fill": "no",
           "dashArray": "8 8"
         }
@@ -204,9 +200,7 @@
       "mapRendering": [
         {
           "icon": "./assets/themes/postal_codes/townhall.svg",
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "iconSize": "40,40,center",
           "location": [
             "point",
             "centroid"

assets/themes/sidewalks/sidewalks.json

@@ -246,9 +246,7 @@
         },
         {
           "#": "left",
-          "color": {
-            "render": "#888"
-          },
+          "color": "#888",
           "dashArray": {
             "render": "",
             "mappings": [

assets/themes/speelplekken/speelplekken.json

@@ -40,9 +40,7 @@
       "mapRendering": [
         {
           "color": "#444444",
-          "width": {
-            "render": "1"
-          }
+          "width": "1"
         }
       ]
     },
@@ -238,9 +236,7 @@
               }
             ]
           },
-          "width": {
-            "render": "9"
-          }
+          "width": "9"
         }
       ]
     }

assets/themes/uk_addresses/uk_addresses.json

@@ -182,9 +182,7 @@
               }
             ]
           },
-          "iconSize": {
-            "render": "40,40,center"
-          },
+          "iconSize": "40,40,center",
           "location": [
             "point",
             "centroid"
@@ -684,9 +682,7 @@
               }
             ]
           },
-          "width": {
-            "render": "3"
-          }
+          "width": "3"
         }
       ]
     },