@dataforsyningen/saul 3.3.3 → 3.4.0

package/modules/api.js

@@ -160,18 +160,25 @@ function post(url, requestbody, token) {
  */
 function getDHM(query, auth) {
   const auth_params = `&username=${auth.API_DHM_TOKENA}&password=${auth.API_DHM_TOKENB}`
-  return get(encodeURI(auth.API_DHM_BASEURL + query + auth_params))
+  return get(encodeURI(auth.API_DHM_BASEURL + query + auth_params), {cache: 'force-cache'})
   .then((data) => data)
 }
 
 /** 
  * API method to GET data from STAC API
- * @param {string} query - STAC API query.
+ * @param {string} query - STAC API query string. May include endpoint path information.
  * @param {{API_STAC_BASEURL: string, API_STAC_TOKEN: string}} auth - API autentication data. See ../config.js.example for reference.
  * @returns {object} Response data
  */
 function getSTAC(query, auth) {
-  return get(auth.API_STAC_BASEURL + query + '&token=' + auth.API_STAC_TOKEN)
+  let requestUrl = `${auth.API_STAC_BASEURL}${query}`
+  const queryStr = query.split('?')[1]
+  if (queryStr) {
+    requestUrl += `&token=${auth.API_STAC_TOKEN}`
+  } else {
+    requestUrl += `?token=${auth.API_STAC_TOKEN}`
+  }
+  return get(requestUrl)
   .then((data) => data)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataforsyningen/saul",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "description": "This is a collection of stand-alone methods for photogrammetry calculations and API interactions for 'Danske Skråfotos'.",
   "main": "index.js",
   "type": "module",