Mannivu/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-08-08 00:44:06 +02:00
commit dcea114c99
7 changed files with 152 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/generateLayerOverview.ts
View file

@ -39,6 +39,8 @@ import { ExtractImages } from "../src/Models/ThemeConfig/Conversion/FixImages"
import { TagRenderingConfigJson } from "../src/Models/ThemeConfig/Json/TagRenderingConfigJson"
import { LayerConfigDependencyGraph, LevelInfo } from "../src/Models/ThemeConfig/LayerConfigDependencyGraph"
import { Lists } from "../src/Utils/Lists"
import { LayerConfigDependencyGraph, LevelInfo } from "../src/Models/ThemeConfig/LayerConfigDependencyGraph"
import { AddContextToTranslations } from "../src/Models/ThemeConfig/Conversion/AddContextToTranslations"
// This scripts scans 'src/assets/layers/*.json' for layer definition files and 'src/assets/themes/*.json' for theme definition files.
// It spits out an overview of those to be used to load them
@ -220,9 +222,16 @@ class LayerBuilder extends Conversion<object, Map<string, LayerConfigJson>> {
context.err("Invalid ID: expected", id, "but got", id)
}
const prepped = this.prepareLayer.convert(config, context)
const withContext = new AddContextToTranslations<LayerConfigJson>("layers:").convertStrict(
prepped,
ConversionContext.construct(
[prepped.id],
["AddContextToTranslations"]
)
)
this._loadedIds.add(id)
this._desugaringState.sharedLayers.set(id, prepped)
return prepped
this._desugaringState.sharedLayers.set(id, withContext)
return withContext
}
private buildLooping(ids: string[], context: ConversionContext) {
@ -686,8 +695,8 @@ class LayerOverviewUtils extends Script {
)
const path = "assets/layers/questions/questions.json"
const sharedQuestions = this.parseLayer(doesImageExist, prepareLayer, path).raw
const sharedQuestionsRaw = this.parseLayer(doesImageExist, prepareLayer, path).raw
const sharedQuestions = new AddContextToTranslations("").convertStrict(sharedQuestionsRaw, ConversionContext.construct(["layers:questions"], []))
const dict = new Map<string, QuestionableTagRenderingConfigJson>()
for (const tr of sharedQuestions.tagRenderings) {