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

Improve error message when merging an override fails

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-04-22 23:43:30 +02:00
parent b484ea005b
commit f2d4458e15
4 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ class SubstituteLayer extends Conversion<string | LayerConfigJson, LayerConfigJs
delete json["override"]["tagRenderings+"]
}
Utils.Merge(json["override"], found)
context.MergeObjectsForOverride(json["override"], found)
layers.push(found)
} catch (e) {
context.err(
@ -305,7 +305,7 @@ class ApplyOverrideAll extends DesugaringStep<LayoutConfigJson> {
)
}
convert(json: LayoutConfigJson, _: ConversionContext): LayoutConfigJson {
convert(json: LayoutConfigJson, ctx: ConversionContext): LayoutConfigJson {
const overrideAll = json.overrideAll
if (overrideAll === undefined) {
return json
@ -324,7 +324,7 @@ class ApplyOverrideAll extends DesugaringStep<LayoutConfigJson> {
for (let layer of json.layers) {
layer = Utils.Clone(<LayerConfigJson>layer)
Utils.Merge(overrideAll, layer)
ctx.MergeObjectsForOverride(overrideAll, layer)
if (tagRenderingsPlus) {
if (!layer.tagRenderings) {
layer.tagRenderings = tagRenderingsPlus