Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get and merge templates in a for of loop #1002

Merged
merged 2 commits into from
Nov 15, 2023
Merged

get and merge templates in a for of loop #1002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65eb8c3
get and merge templates in a for of loop
dbauszus-glx Nov 14, 2023
0c3e4a4
Merge branch 'main' into getlayer-templates
dbauszus-glx Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions mod/workspace/getLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ module.exports = async (params) => {
layer = merge(await getTemplate(workspace.templates[layer.template || layer.key]), layer)
}

if (Array.isArray(layer.templates)) {
if (Array.isArray(layer.templates)) for (const key of layer.templates){

// Merge templates from templates array into layer.
layer.templates.forEach(async template => {
let template = Object.hasOwn(workspace.templates, key) && await getTemplate(workspace.templates[key])

// Merge the workspace template into the layer.
layer = merge(await getTemplate(workspace.templates[template]), layer)
})
// Merge the workspace template into the layer.
layer = merge(template, layer)
}

// Check for layer geom[s].
Expand Down