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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-02-21 19:17:42 +01:00
commit 7c5170da15
193 changed files with 4011 additions and 4462 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Models/ThemeConfig/Conversion/Conversion.ts
View file

@ -156,7 +156,7 @@ export class On<P, T> extends DesugaringStep<T> {
convert(json: T, context: ConversionContext): T {
const key = this.key
const value: P = json[key]
const value: P = json?.[key]
if (value === undefined || value === null) {
return json
}

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

@ -365,7 +365,7 @@ class AddDependencyLayersToTheme extends DesugaringStep<LayoutConfigJson> {
themeId: string
): { config: LayerConfigJson; reason: string }[] {
const dependenciesToAdd: { config: LayerConfigJson; reason: string }[] = []
const loadedLayerIds: Set<string> = new Set<string>(alreadyLoaded.map((l) => l.id))
const loadedLayerIds: Set<string> = new Set<string>(alreadyLoaded.map((l) => l?.id))
// Verify cross-dependencies
let unmetDependencies: {