Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: also show default layers when loading an official theme via theme.html

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-01-22 01:24:21 +01:00
parent 6c1da50173
commit b844a0700e
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Logic/DetermineTheme.ts
View file

@ -59,6 +59,21 @@ export default class DetermineTheme {
return layoutConfig
}
private static createConversionContext(): DesugaringContext {
const knownLayersDict = new Map<string, LayerConfigJson>()
for (const key in known_layers["layers"]) {
const layer = known_layers["layers"][key]
knownLayersDict.set(layer.id, <LayerConfigJson>layer)
}
const convertState: DesugaringContext = {
tagRenderings: DetermineTheme.getSharedTagRenderings(),
tagRenderingOrder: DetermineTheme.getSharedTagRenderingOrder(),
sharedLayers: knownLayersDict,
publicLayers: new Set<string>()
}
return convertState
}
/**
* Gets the correct layout for this website
*/
@ -107,7 +122,8 @@ export default class DetermineTheme {
"./assets/generated/themes/" + id + ".json",
1000 * 60 * 60 * 60
)
return new ThemeConfig(config, true)
const withDefault = new PrepareTheme(this.createConversionContext()).convertStrict(config)
return new ThemeConfig(withDefault, true)
}
private static getSharedTagRenderings(): Map<string, QuestionableTagRenderingConfigJson> {
@ -163,22 +179,12 @@ export default class DetermineTheme {
}
}
const knownLayersDict = new Map<string, LayerConfigJson>()
for (const key in known_layers["layers"]) {
const layer = known_layers["layers"][key]
knownLayersDict.set(layer.id, <LayerConfigJson>layer)
}
const convertState: DesugaringContext = {
tagRenderings: DetermineTheme.getSharedTagRenderings(),
tagRenderingOrder: DetermineTheme.getSharedTagRenderingOrder(),
sharedLayers: knownLayersDict,
publicLayers: new Set<string>(),
}
json = new FixLegacyTheme().convertStrict(json)
const raw = json
json = new FixImages(DetermineTheme._knownImages).convertStrict(json)
json.enableNoteImports = json.enableNoteImports ?? false
const convertState = this.createConversionContext()
json = new PrepareTheme(convertState).convertStrict(json)
console.log("The layoutconfig is ", json)

14
src/Models/ThemeConfig/Conversion/PrepareTheme.ts
View file

@ -1,14 +1,4 @@
import {
Concat,
Conversion,
DesugaringContext,
DesugaringStep,
Each,
Fuse,
On,
Pass,
SetDefault,
} from "./Conversion"
import { Concat, Conversion, DesugaringContext, DesugaringStep, Each, Fuse, On, Pass, SetDefault } from "./Conversion"
import { ThemeConfigJson } from "../Json/ThemeConfigJson"
import { PrepareLayer } from "./PrepareLayer"
import { LayerConfigJson } from "../Json/LayerConfigJson"
@ -175,7 +165,7 @@ class SubstituteLayer extends Conversion<string | LayerConfigJson, LayerConfigJs
}
}
class AddDefaultLayers extends DesugaringStep<ThemeConfigJson> {
export class AddDefaultLayers extends DesugaringStep<ThemeConfigJson> {
private readonly _state: DesugaringContext
constructor(state: DesugaringContext) {