Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2022-02-04 13:17:54 +01:00
commit 3305d108c7
2 changed files with 3 additions and 3 deletions

View file

@ -103,7 +103,7 @@ export default class AvailableBaseLayersImplementation implements AvailableBaseL
id: id, id: id,
name: name, name: name,
layer: () => L.tileLayer.provider(id, { layer: () => L.tileLayer.provider(id, {
maxNativeZoom: layer.opttions.maxZoom maxNativeZoom: layer.options?.maxZoom
}), }),
min_zoom: 1, min_zoom: 1,
max_zoom: layer.options.maxZoom, max_zoom: layer.options.maxZoom,

View file

@ -143,8 +143,8 @@ export default class DetermineLayout {
tagRenderings: SharedTagRenderings.SharedTagRenderingJson, tagRenderings: SharedTagRenderings.SharedTagRenderingJson,
sharedLayers: knownLayersDict sharedLayers: knownLayersDict
} }
json = new FixLegacyTheme().convertStrict(converState, json, "While loading a dynamic theme") json = new FixLegacyTheme().convertStrict(json, "While loading a dynamic theme")
json = new PrepareTheme().convertStrict(converState, json, "While preparing a dynamic theme") json = new PrepareTheme(converState).convertStrict(json, "While preparing a dynamic theme")
console.log("The layoutconfig is ", json) console.log("The layoutconfig is ", json)
return json return json
} }