From 238de89ad54fd0c8c0d4bf75f49282d7921f21a2 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 20 Jun 2023 10:40:27 +0200
Subject: [PATCH] Fix: tests

---
 Models/ThemeConfig/Conversion/LegacyJsonConvert.ts      | 3 +++
 test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts    | 4 ++--
 test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
index 9a3eea9815..1ff77b85c9 100644
--- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
+++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
@@ -156,6 +156,9 @@ export class UpdateLegacyLayer extends DesugaringStep<
 
         for (const rendering of config.mapRendering) {
             for (const key in rendering) {
+                if (!rendering[key]) {
+                    continue
+                }
                 if (
                     typeof rendering[key]["render"] === "string" &&
                     Object.keys(rendering[key]).length === 1
diff --git a/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts b/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
index 999a08a7e2..8dc28fa074 100644
--- a/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
+++ b/test/Logic/OSM/Actions/ReplaceGeometryAction.spec.ts
@@ -44,7 +44,7 @@ describe("ReplaceGeometryAction", () => {
                     mapRendering: [
                         {
                             icon: "square:#cc0",
-                            iconSize: "5,5,center",
+                            iconSize: "5,5",
                             location: ["point"],
                         },
                     ],
@@ -292,7 +292,7 @@ describe("ReplaceGeometryAction", () => {
                 tagRenderings: [],
                 mapRendering: [
                     {
-                        iconSize: "50,50,center",
+                        iconSize: "50,50",
                         icon: "./assets/themes/grb/housenumber_blank.svg",
                         location: ["point", "centroid"],
                     },
diff --git a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
index bd1b476897..1904cb2f7a 100644
--- a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
+++ b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
@@ -42,6 +42,7 @@ describe("PrepareTheme", () => {
         const prepareStep = new PrepareTheme({
             tagRenderings: new Map<string, TagRenderingConfigJson>(),
             sharedLayers: sharedLayers,
+            publicLayers: new Set<string>(),
         })
         let themeConfigJsonPrepared = prepareStep.convert(theme, "test").result
         const themeConfig = new LayoutConfig(themeConfigJsonPrepared)
@@ -59,6 +60,7 @@ describe("PrepareTheme", () => {
         let themeConfigJsonPrepared = new PrepareTheme({
             tagRenderings: new Map<string, TagRenderingConfigJson>(),
             sharedLayers: sharedLayers,
+            publicLayers: new Set<string>(),
         }).convert(themeConfigJson, "test").result
         const themeConfig = new LayoutConfig(themeConfigJsonPrepared)
         const layerUnderTest = <LayerConfig>(
@@ -73,6 +75,7 @@ describe("PrepareTheme", () => {
         let themeConfigJsonPrepared = new PrepareTheme({
             tagRenderings: new Map<string, TagRenderingConfigJson>(),
             sharedLayers: sharedLayers,
+            publicLayers: new Set<string>(),
         }).convert(
             {
                 ...themeConfigJson,
@@ -102,6 +105,7 @@ describe("PrepareTheme", () => {
         const ctx: DesugaringContext = {
             sharedLayers: new Map<string, LayerConfigJson>([["layer-example", testLayer]]),
             tagRenderings: new Map<string, TagRenderingConfigJson>(),
+            publicLayers: new Set<string>(),
         }
         const layout: LayoutConfigJson = {
             description: "A testing theme",