get workspace from module in getLayer

GEOLYTIX · Oct 26, 2023 · 8c0387c · 8c0387c
1 parent 6a83556
commit 8c0387c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/mod/workspace/getLayer.js b/mod/workspace/getLayer.js
@@ -4,9 +4,11 @@ const merge = require('../utils/merge')
 
 const getTemplate = require('./getTemplate')
 
+const workspaceCache = require('./cache')
+
 module.exports = async (req) => {
 
-  const workspace = req.params.workspace
+  const workspace = await workspaceCache()
 
   if (!Object.hasOwn(workspace.locales, req.params.locale)) {
     return new Error('Unable to validate locale param.') //400

diff --git a/mod/workspace/getTemplate.js b/mod/workspace/getTemplate.js
@@ -26,13 +26,7 @@ module.exports = async (template) => {
     return template
   }
 
-  if (typeof getFrom[template.src.split(':')[0]] !== 'function') {
-
-    console.warn(`getFrom[${template.src.split(':')[0]}] is not a method.`);
-    return template
-  }
-
-  const response =  await getFrom[template.src.split(':')[0]]?.(template.src)
+  const response =  await getFrom[template.src.split(':')[0]](template.src)
 
   if (response instanceof Error) {