Refactoring: More fixes to the themes

Models/ThemeConfig/Conversion/PrepareTheme.ts

@@ -586,6 +586,7 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep<LayoutConfigJson>
 }
 
 export class PrepareTheme extends Fuse<LayoutConfigJson> {
+    private state: DesugaringContext
     constructor(
         state: DesugaringContext,
         options?: {
@@ -612,6 +613,7 @@ export class PrepareTheme extends Fuse<LayoutConfigJson> {
             new AddDependencyLayersToTheme(state),
             new AddImportLayers()
         )
+        this.state = state
     }
 
     convert(
@@ -619,6 +621,10 @@ export class PrepareTheme extends Fuse<LayoutConfigJson> {
         context: string
     ): { result: LayoutConfigJson; errors: string[]; warnings: string[]; information: string[] } {
         const result = super.convert(json, context)
+        if (this.state.publicLayers.size === 0) {
+            // THis is a bootstrapping run, no need to already set this flag
+            return result
+        }
 
         const needsNodeDatabase = result.result.layers?.some((l: LayerConfigJson) =>
             l.tagRenderings?.some((tr: TagRenderingConfigJson) =>

UI/i18n/Translation.ts

@@ -26,9 +26,14 @@ export class Translation extends BaseUIElement {
             if (!translations.hasOwnProperty(translationsKey)) {
                 continue
             }
-            if (translationsKey === "_context" || translationsKey === "_meta") {
+            if (
+                translationsKey === "_context" ||
+                translationsKey === "_meta" ||
+                translationsKey === "special"
+            ) {
                 continue
             }
+
             count++
             if (typeof translations[translationsKey] != "string") {
                 console.error(

assets/layers/gps_track/gps_track.json

@@ -5,7 +5,8 @@
   "source": "special",
   "title": {
     "render": {
-      "en": "Your travelled path"
+      "en": "Your travelled path",
+      "nl": "Jouw traject"
     }
   },
   "shownByDefault": false,

assets/themes/grb/grb.json

@@ -542,9 +542,7 @@
           "color": "#888888"
         }
       ],
-      "title": {
+      "title":  "Service road",
-        "render": "Service road"
-      },
       "tagRenderings": []
     },
     {
@@ -759,9 +757,7 @@
             "location": [
               "point"
             ],
-            "icon": {
+            "icon":"./assets/svg/robot.svg",
-              "render": "./assets/svg/robot.svg"
-            },
             "iconSize": "15,15"
           }
         ]
@@ -773,4 +769,4 @@
   "overpassMaxZoom": 15,
   "osmApiTileSize": 17,
   "credits": "Pieter Vander Vennet"
-}
+}

assets/themes/onwheels/onwheels.json

@@ -207,7 +207,7 @@
           {
             "icon": "./assets/themes/onwheels/parking.svg",
             "anchor": "bottom",
-            "iconSize": {
+            "=iconSize": {
               "render": "20,20",
               "mappings": [
                 {
@@ -514,4 +514,4 @@
     ]
   },
   "enableDownload": true
-}
+}

assets/themes/stations/stations.json

@@ -191,12 +191,8 @@
         "minzoom": 19,
         "mapRendering+": [
           {
-            "color": {
+            "color": "#00f",
-              "render": "#00f"
+            "width": "8"
-            },
-            "width": {
-              "render": "8"
-            }
           }
         ]
       }
@@ -214,12 +210,8 @@
         "minzoom": 19,
         "mapRendering+": [
           {
-            "color": {
+            "color":  "yellow",
-              "render": "yellow"
+            "width": "8"
-            },
-            "width": {
-              "render": "8"
-            }
           }
         ]
       }
@@ -404,4 +396,4 @@
       ]
     }
   ]
-}
+}

assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json

@@ -109,9 +109,7 @@
         "minzoom": 14,
         "mapRendering": [
           {
-            "icon": {
+            "icon": "./assets/themes/toerisme_vlaanderen/bench.svg"
-              "render": "./assets/themes/toerisme_vlaanderen/bench.svg"
-            }
           }
         ]
       }
@@ -122,9 +120,7 @@
         "minzoom": 14,
         "mapRendering": [
           {
-            "icon": {
+            "icon": "./assets/themes/toerisme_vlaanderen/picnic_table.svg"
-              "render": "./assets/themes/toerisme_vlaanderen/picnic_table.svg"
-            }
           }
         ]
       }
@@ -135,9 +131,7 @@
         "minzoom": 14,
         "mapRendering": [
           {
-            "icon": {
+            "icon": "./assets/themes/toerisme_vlaanderen/observation_tower.svg"
-              "render": "./assets/themes/toerisme_vlaanderen/observation_tower.svg"
-            }
           }
         ]
       }
@@ -232,9 +226,7 @@
         "minzoom": 14,
         "mapRendering": [
           {
-            "icon": {
+            "icon": "./assets/themes/toerisme_vlaanderen/playground.svg"
-              "render": "./assets/themes/toerisme_vlaanderen/playground.svg"
-            }
           }
         ]
       },
@@ -247,4 +239,4 @@
   "hideFromOverview": true,
   "enableMoreQuests": false,
   "enableShareScreen": false
-}
+}