Chore: small cleanups, formatting

src/Customizations/AllKnownLayouts.ts

@@ -28,7 +28,6 @@ export class AllKnownLayoutsLazy {
                 }
                 const defaultLayer = AllSharedLayers.getSharedLayersConfigs().get(layerId)
                 if (defaultLayer === undefined) {
-                    console.error("Could not find builtin layer", layerId)
                     continue
                 }
                 themeConfigJson.layers.push(defaultLayer)

src/Logic/State/UserSettingsMetaTagging.ts

@@ -1,42 +1,14 @@
 import { Utils } from "../../Utils"
 /** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */
 export class ThemeMetaTagging {
-    public static readonly themeName = "usersettings"
+   public static readonly themeName = "usersettings"
 
-    public metaTaggging_for_usersettings(feat: { properties: Record<string, string> }) {
+   public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) {
-        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () =>
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) ) 
-            feat.properties._description
+      Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/&lt;/g,'<')?.replace(/&gt;/g,'>') ?? '' ) 
-                .match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href   }) (feat)  ) 
-                ?.at(1)
+      Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat)  ) 
-        )
+      Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a ) 
-        Utils.AddLazyProperty(
+      feat.properties['__current_backgroun'] = 'initial_value'
-            feat.properties,
+   }
-            "_d",
+}
-            () => feat.properties._description?.replace(/&lt;/g, "<")?.replace(/&gt;/g, ">") ?? ""
-        )
-        Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () =>
-            ((feat) => {
-                const e = document.createElement("div")
-                e.innerHTML = feat.properties._d
-                return Array.from(e.getElementsByTagName("a")).filter(
-                    (a) => a.href.match(/mastodon|en.osm.town/) !== null
-                )[0]?.href
-            })(feat)
-        )
-        Utils.AddLazyProperty(feat.properties, "_mastodon_link", () =>
-            ((feat) => {
-                const e = document.createElement("div")
-                e.innerHTML = feat.properties._d
-                return Array.from(e.getElementsByTagName("a")).filter(
-                    (a) => a.getAttribute("rel")?.indexOf("me") >= 0
-                )[0]?.href
-            })(feat)
-        )
-        Utils.AddLazyProperty(
-            feat.properties,
-            "_mastodon_candidate",
-            () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a
-        )
-        feat.properties["__current_backgroun"] = "initial_value"
-    }
-}

src/Models/ThemeConfig/Conversion/Conversion.ts

@@ -32,7 +32,7 @@ export abstract class Conversion<TIn, TOut> {
         this.name = name
     }
 
-    public convertStrict(json: TIn, context?: ConversionContext): TOut {
+    public convertStrict(json: NonNullable<TIn>, context?: ConversionContext): TOut {
         context ??= ConversionContext.construct([], [])
         context = context.inOperation(this.name)
 
@@ -276,7 +276,7 @@ export class Fuse<T> extends DesugaringStep<T> {
                 "This fused pipeline of the following steps: " +
                 steps.map((s) => s.name).join(", "),
             Utils.Dedup([].concat(...steps.map((step) => step.modifiedAttributes))),
-            "Fuse(" + steps.map((s) => s.name).join(", ") + ")"
+            "Fuse"
         )
         this.steps = Utils.NoNull(steps)
     }

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -1000,4 +1000,11 @@ export class PrepareLayer extends Fuse<LayerConfigJson> {
             new PruneFilters()
         )
     }
+
+    convert(json: LayerConfigJson, context: ConversionContext): LayerConfigJson {
+        if(json === undefined || json === null){
+            throw "Error: prepareLayer got null"
+        }
+        return super.convert(json, context)
+    }
 }

src/Models/ThemeConfig/Conversion/PrepareTheme.ts

@@ -472,7 +472,7 @@ class PreparePersonalTheme extends DesugaringStep<ThemeConfigJson> {
 class WarnForUnsubstitutedLayersInTheme extends DesugaringStep<ThemeConfigJson> {
     constructor() {
         super(
-            "Generates a warning if a theme uses an unsubstituted layer",
+            "Generates a warning if a theme uses an inline layer; we recommend splitting of all layers in separate files",
             ["layers"],
             "WarnForUnsubstitutedLayersInTheme"
         )

src/UI/Popup/AutoApplyButton.ts

@@ -41,6 +41,9 @@ export interface AutoAction extends SpecialVisualization {
     ): Promise<void>
 }
 
+/**
+ * @deprecated
+ */
 class ApplyButton extends UIElement {
     private readonly icon: string
     private readonly text: string

src/assets/bing.json

@@ -1 +1 @@
-{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t0.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14875&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null}
+{"properties":{"name":"Bing Maps Aerial","id":"Bing","url":"https://ecn.t2.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=14880&pr=odbl&n=f","type":"bing","category":"photo","min_zoom":1,"max_zoom":22},"type":"Feature","geometry":null}