@eodash/eodash 5.3.2 → 5.4.0

package/core/client/composables/DefineEodash.js

@@ -10,7 +10,9 @@ import { inject, reactive } from "vue";
  * @returns {Promise<import("@/types").Eodash | null | undefined>}
  * @see {@linkplain '@/eodash.js'}
  */
-export const useEodashRuntime = async (runtimeConfig) => {
+export const useEodashRuntime = async (
+  runtimeConfig = process.env.EODASH_RUNTIME_CONFIG,
+) => {
   let eodashConfig;
   const eodash = /** @type {import("@/types").Eodash} */ (inject(eodashKey));
 

package/core/client/eodashSTAC/EodashCollection.js

@@ -28,6 +28,8 @@ import {
 import axios from "@/plugins/axios";
 import log from "loglevel";
 import { dataThemesBrands } from "@/utils/states";
+import { useEventBus } from "@vueuse/core";
+import { eoxLayersKey } from "@/utils/keys";
 
 export class EodashCollection {
   #collectionUrl = "";
@@ -130,25 +132,19 @@ export class EodashCollection {
     this.selectedItem = item;
     const title = this.#collectionStac?.title || this.#collectionStac?.id || "";
     layersJson.unshift(
-      ...(await this.buildJsonArray(
-        item,
-        stacItemUrl,
-        title,
-        isObservationPoint,
-      )),
+      ...(await this.buildJsonArray(item, title, isObservationPoint)),
     );
     return layersJson;
   };
 
   /**
    * @param {import("stac-ts").StacItem} item
-   * @param {string} itemUrl
    * @param {string} title
    * @param {boolean} isObservationPoint
    * @param {string} [itemDatetime]
    * @returns {Promise<Record<string,any>[]>} layers
    * */
-  async buildJsonArray(item, itemUrl, title, isObservationPoint, itemDatetime) {
+  async buildJsonArray(item, title, isObservationPoint, itemDatetime) {
     if (!item) {
       console.warn("[eodash] no item provided to buildJsonArray");
       return [];
@@ -157,7 +153,6 @@ export class EodashCollection {
     log.debug(
       "Building JSON array",
       item,
-      itemUrl,
       title,
       isObservationPoint,
       itemDatetime,
@@ -184,19 +179,6 @@ export class EodashCollection {
     // will try to extract anything it supports but for which we have
     // less control.
 
-    const rasterformURL = /** @type {string|undefined} */ (
-      this.#collectionStac?.["eodash:rasterform"]
-    );
-    /** @type {import("@/types").EodashRasterJSONForm|undefined} */
-    const rasterForm = rasterformURL
-      ? await axios.get(rasterformURL).then((resp) => resp.data)
-      : undefined;
-    let { layerConfig, style } = extractLayerConfig(
-      this.#collectionStac?.id ?? "",
-      await fetchStyle(item, itemUrl),
-      rasterForm,
-    );
-
     const { layerDatetime, timeControlValues } = extractLayerTimeValues(
       await this.getItems(),
       item.properties?.datetime ??
@@ -210,9 +192,11 @@ export class EodashCollection {
       }
       return data;
     }, /** @type {Record<string,import('stac-ts').StacAsset>} */ ({}));
+
     const isSupported =
-      item.links.some((link) => ["wms", "xyz", "wmts", "vector-tile"].includes(link.rel)) ||
-      Object.keys(dataAssets).length;
+      item.links.some((link) =>
+        ["wms", "xyz", "wmts", "vector-tile"].includes(link.rel),
+      ) || Object.keys(dataAssets).length;
 
     if (isSupported) {
       // Checking for potential legend asset
@@ -230,20 +214,19 @@ export class EodashCollection {
         this.#collectionStac?.id ?? "",
         title,
         item,
-        itemUrl,
         layerDatetime,
         extraProperties,
+        this.#collectionStac,
       );
 
       jsonArray.push(
         ...((this.rasterEndpoint &&
-          createLayerFromRender(
+          await createLayerFromRender(
             this.rasterEndpoint,
             this.#collectionStac,
             item,
             {
               ...extraProperties,
-              ...(layerConfig && { layerConfig }),
               ...(layerDatetime && { layerDatetime }),
             },
           )) ||
@@ -253,8 +236,6 @@ export class EodashCollection {
           title || this.#collectionStac?.title || item.id,
           dataAssets,
           item,
-          style,
-          layerConfig,
           layerDatetime,
           extraProperties,
         )),
@@ -262,6 +243,10 @@ export class EodashCollection {
         ...links,
       );
     } else {
+      // get the correct style which is not attached to a link
+      const id = this.#collectionStac?.id ?? "";
+      const styles = await fetchStyle(item);
+      let { layerConfig, style } = extractLayerConfig(id, styles);
       // fallback to STAC
       const json = {
         type: "STAC",
@@ -269,7 +254,7 @@ export class EodashCollection {
         displayFootprint: false,
         data: item,
         properties: {
-          id: this.#collectionStac?.id ?? "",
+          id,
           title: title || item.id,
           layerConfig,
         },
@@ -403,17 +388,14 @@ export class EodashCollection {
       return [];
     }
     // get all style links, which could contribute by tooltip config and aggregate them
-    const styles = await fetchAllStyles(
-      this.selectedItem,
-      `${this.#collectionUrl}/${this.selectedItem.id}`,
-    );
+    const styles = await fetchAllStyles(this.selectedItem);
     // get only unique ids to avoid duplicates
     const aggregatedTooltips = [
       ...new Map(
         styles
-          .flatMap(style => style.tooltip || [])
-          .map(entry => [entry.id, entry])
-      ).values()
+          .flatMap((style) => style.tooltip || [])
+          .map((entry) => [entry.id, entry]),
+      ).values(),
     ];
     this.#tooltipProperties = aggregatedTooltips ?? [];
     return this.#tooltipProperties;
@@ -450,7 +432,6 @@ export class EodashCollection {
       // if specifiedLink is an item, we create layers from it
       newLayers = await this.buildJsonArray(
         specifiedLink,
-        this.#collectionUrl + `/items/${specifiedLink.id}`,
         this.#collectionStac?.title || this.#collectionStac?.id || "",
         this.#collectionStac?.endpointtype === "GeoDB" ||
           !!this.#collectionStac?.locations,
@@ -466,16 +447,22 @@ export class EodashCollection {
       currentLayers = getCompareLayers();
     }
 
-
     const oldLayer = findLayer(currentLayers, layer);
 
-
     const toBeReplacedLayers = findLayersByLayerPrefix(currentLayers, oldLayer);
 
     if (!toBeReplacedLayers) {
       return;
     }
-    const updatedLayers = replaceLayersInStructure(currentLayers, toBeReplacedLayers, newLayers);
+    const updatedLayers = replaceLayersInStructure(
+      currentLayers,
+      toBeReplacedLayers,
+      newLayers,
+    );
+
+    // Emit event to update potential widget dependencies such as process layer ids
+    const layersEvents = useEventBus(eoxLayersKey);
+    layersEvents.emit("layertime:updated", newLayers);
 
     return updatedLayers;
   }
@@ -499,17 +486,16 @@ export class EodashCollection {
     );
 
     return [
-        //@ts-expect-error indicator instead of item
       ...(await createLayersFromLinks(
         indicator?.id ?? "",
         indicator?.title || indicator.id,
+        //@ts-expect-error indicator instead of item
         indicator,
       )),
       ...(await createLayersFromAssets(
         indicator?.id ?? "",
         indicator?.title || indicator.id,
         indicatorAssets,
-        //@ts-expect-error indicator instead of item
         indicator,
       )),
     ];

package/core/client/eodashSTAC/auth.js

@@ -1,13 +1,13 @@
 /**
-* Generic handler for possible authentications schemes as defined in STAC authentication extension.
-* @param {import("@/types").StacAuthItem } item
-* @param {import("@/types").StacAuthLink | import("@/types").StacAuthAsset} linkOrAsset
-* @returns {string}
-*/
+ * Generic handler for possible authentications schemes as defined in STAC authentication extension.
+ * @param {import("@/types").StacAuthItem } item
+ * @param {import("@/types").StacAuthLink | import("@/types").StacAuthAsset} linkOrAsset
+ * @returns {string}
+ */
 export function handleAuthenticationOfLink(item, linkOrAsset) {
   // browse through all authentication refs on a link to find a first one we support
   for (const authRef of linkOrAsset["auth:refs"] || []) {
-    const authSchemes  = item["auth:schemes"];
+    const authSchemes = item["auth:schemes"];
     if (authRef in authSchemes) {
       switch (authSchemes[authRef].type) {
         case "apiKey": {
@@ -22,18 +22,20 @@ export function handleAuthenticationOfLink(item, linkOrAsset) {
         // case "oauth2":
         // todo add more handlers when needed
         default:
-        console.error(`eodash does not support referenced authentication scheme ${authRef}`);
+          console.error(
+            `eodash does not support referenced authentication scheme ${authRef}`,
+          );
       }
     }
   }
   return linkOrAsset.href;
 }
 /**
-* Generic handler for possible authentications schemes as defined in STAC authentication extension.
-* @param {import("@/types").ApiKeyAuthScheme } schemeDef
-* @param { string } href
-* @returns { string }
-*/
+ * Generic handler for possible authentications schemes as defined in STAC authentication extension.
+ * @param {import("@/types").ApiKeyAuthScheme } schemeDef
+ * @param { string } href
+ * @returns { string }
+ */
 function handleApiKeyBasedAuth(schemeDef, href) {
   // add token to query parameters of href
   let url = href;
@@ -45,12 +47,14 @@ function handleApiKeyBasedAuth(schemeDef, href) {
       if (envValue) {
         url = setQueryParam(href, apiKey, envValue);
       } else {
-        console.error(`env variable ${envVar} for authentication parameter ${apiKey} not set`);
+        console.error(
+          `env variable ${envVar} for authentication parameter ${apiKey} not set`,
+        );
       }
-      break
+      break;
     }
     default:
-      console.error('eodash does not support any referenced handler');
+      console.error("eodash does not support any referenced handler");
   }
   return url;
 }