get and merge templates in a for of loop

GEOLYTIX · Nov 14, 2023 · 65eb8c3 · 65eb8c3
1 parent 4a547b7
commit 65eb8c3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/mod/workspace/getLayer.js b/mod/workspace/getLayer.js
@@ -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].