@eodash/eodash 5.0.0-alpha.2.13 → 5.0.0-alpha.2.15

package/core/client/composables/index.js

@@ -1,7 +1,13 @@
 // functions of this folder can only be consumed inside setup stores,
 // setup functions or vue composition api components
 
-import { currentUrl, datetime, indicator, mapPosition } from "@/store/States";
+import {
+  currentCompareUrl,
+  currentUrl,
+  datetime,
+  indicator,
+  mapPosition,
+} from "@/store/States";
 import eodash from "@/eodash";
 import { useTheme } from "vuetify/lib/framework.mjs";
 import { onMounted, watch } from "vue";
@@ -36,6 +42,35 @@ export const useAbsoluteUrl = (rel = "", base = eodash.stacEndpoint) => {
   return currentUrl;
 };
 
+/**
+ * Use the absolute compare URL from a relative link
+ *
+ * @param {string} [rel=''] Default is `''`
+ * @param {string} [base=eodash.stacEndpoint] - Base URL, default value is the
+ *   root stac catalog. Default is `eodash.stacEndpoint`
+ * @returns {import("vue").Ref<string>} - Returns `currentUrl`
+ * @see {@link '@/store/States.js'}
+ */
+export const useCompareAbsoluteUrl = (rel = "", base = eodash.stacEndpoint) => {
+  if (!rel || rel.includes("http")) {
+    currentCompareUrl.value = base;
+    return currentCompareUrl;
+  }
+
+  const st = base.split("/");
+  const arr = rel.split("/");
+  st.pop();
+
+  for (let i = 0; i < arr.length; i++) {
+    if (arr[i] == ".") continue;
+    if (arr[i] == "..") st.pop();
+    else st.push(arr[i]);
+  }
+
+  currentCompareUrl.value = st.join("/");
+  return currentCompareUrl;
+};
+
 /**
  * Updates an existing Vuetify theme. updates only the values provided in the
  * `ThemeDefinition`

package/core/client/eodash.js

@@ -44,6 +44,9 @@ export const eodash = reactive({
       type: "internal",
       widget: {
         name: "EodashMap",
+        properties: {
+          // enableCompare: true,
+        },
       },
     },
     widgets: [
@@ -54,6 +57,10 @@ export const eodash = reactive({
         layout: { x: 0, y: 0, w: 3, h: 8 },
         widget: {
           name: "EodashItemFilter",
+          properties: {
+            // enableCompare: true,
+            aggregateResults: "collection_group",
+          },
         },
       },
       {
@@ -78,13 +85,27 @@ export const eodash = reactive({
                   properties: {
                     for: currentUrl,
                     allowHtml: "true",
-                    styleOverride:
-                      "#properties li > .value {font-weight: normal !important;}",
-                    header: "[]",
+                    styleOverride: `.single-property {columns: 1!important;}
+                      h1 {margin:0px!important;font-size:16px!important;}
+                      header h1:after {
+                        content:' ';
+                        display:block;
+                        border:1px solid #d0d0d0;
+                      }
+                      h2 {font-size:15px}
+                      h3 {font-size:14px}
+                      summary {cursor: pointer;}
+                      #properties li > .value { font-weight: normal !important;}
+                      main {padding-bottom: 10px;}
+                      .footer-container {line-height:1;}
+                      .footer-container button {margin-top: -10px;}
+                      .footer-container small {font-size:10px;line-height:1;}`,
+                    header: '["title"]',
+                    tags: '["themes"]',
                     subheader: "[]",
-                    properties: '["description"]',
-                    featured: "[]",
-                    footer: "[]",
+                    properties: '["satellite","sensor","agency","extent"]',
+                    featured: '["description","providers","assets","links"]',
+                    footer: '["sci:citation"]',
                   },
                   tagName: "eox-stacinfo",
                 },

package/core/client/store/States.js

@@ -2,6 +2,10 @@ import { ref } from "vue";
 
 /** Currently selected STAC endpoint */
 export const currentUrl = ref("");
+
+/** Currently selected compare STAC endpoint */
+export const currentCompareUrl = ref("");
+
 /** Currently selected datetime */
 export const datetime = ref(new Date().toISOString());
 

package/core/client/store/stac.js

@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { inject, ref } from "vue";
 import axios from "axios";
-import { useAbsoluteUrl } from "@/composables/index";
+import { useAbsoluteUrl, useCompareAbsoluteUrl } from "@/composables/index";
 import { eodashKey } from "@/utils/keys";
 import { indicator } from "@/store/States";
 
@@ -25,6 +25,18 @@ export const useSTAcStore = defineStore("stac", () => {
    */
   const selectedStac = ref(null);
 
+  /**
+   * Selected STAC object.
+   *
+   * @type {import("vue").Ref<
+   *   | import("stac-ts").StacCatalog
+   *   | import("stac-ts").StacCollection
+   *   | import("stac-ts").StacItem
+   *   | null
+   * >}
+   */
+  const selectedCompareStac = ref(null);
+
   const eodash = /** @type {import("@/types").Eodash} */ (inject(eodashKey));
 
   /**
@@ -77,5 +89,33 @@ export const useSTAcStore = defineStore("stac", () => {
       });
   }
 
-  return { stac, loadSTAC, loadSelectedSTAC, selectedStac };
+  /**
+   * Fetches selected stac object and assign it to `selectedCompareStac`
+   *
+   * @async
+   * @param {string} relativePath - Stac link href
+   * @returns {Promise<void>}
+   * @see {@link selectedCompareStac}
+   */
+  async function loadSelectedCompareSTAC(relativePath = "") {
+    const absoluteUrl = useCompareAbsoluteUrl(relativePath);
+
+    await axios
+      .get(absoluteUrl.value)
+      .then((resp) => {
+        selectedCompareStac.value = resp.data;
+      })
+      .catch((err) => {
+        throw new Error("error loading the selected comparison STAC", err);
+      });
+  }
+
+  return {
+    stac,
+    loadSTAC,
+    loadSelectedSTAC,
+    loadSelectedCompareSTAC,
+    selectedStac,
+    selectedCompareStac,
+  };
 });

package/core/client/utils/createLayers.js

@@ -41,7 +41,7 @@ export async function createLayersFromDataAssets(
             },
           }),
         },
-        ...(!style?.variables && {style}),
+        ...(!style?.variables && { style }),
       };
       extractRoles(layer.properties, assets[ast]?.roles ?? []);
       jsonArray.push(layer);

package/core/client/utils/eodashSTAC.js

@@ -6,7 +6,6 @@ import {
   fetchStyle,
   generateFeatures,
   setMapProjFromCol,
-  uid,
 } from "./helpers";
 import { registerProjection } from "@/store/Actions";
 import {
@@ -159,17 +158,16 @@ export class EodashCollection {
       }
       return data;
     }, /** @type {Record<string,import('stac-ts').StacAsset>} */ ({}));
-
     const isSupported =
       item.links.some((link) => ["wms", "xyz"].includes(link.rel)) ||
       Object.keys(dataAssets).length;
 
     if (isSupported) {
       jsonArray.push(
-        ...createLayersFromLinks(uid(), title, item),
+        ...createLayersFromLinks(item.id, title, item),
 
         ...(await createLayersFromDataAssets(
-          uid(),
+          `${item.collection}_${item.id}_assets`,
           title || this.#collectionStac?.title || item.id,
           dataAssets,
           style,

package/core/client/utils/helpers.js

@@ -97,7 +97,6 @@ export function extractCollectionUrls(stacObject, basepath) {
   // Indicator assumes Catalog-Collection-Collection-Item
   // TODO: this is not the most stable test approach,
   // we should discuss potential other approaches
-
   if (stacObject?.links && stacObject?.links[1].rel === "item") {
     collectionUrls.push(basepath);
   } else if (stacObject?.links[1].rel === "child") {
@@ -111,9 +110,6 @@ export function extractCollectionUrls(stacObject, basepath) {
   return collectionUrls;
 }
 
-export const uid = () =>
-  Date.now().toString(36) + Math.random().toString(36).substring(2);
-
 /**
  * Assign extracted roles to layer properties
  * @param {Record<string,any>} properties

package/dist/client/{DashboardLayout-v8_zE0jH.js → DashboardLayout-DQE4aB6e.js}

@@ -1,5 +1,5 @@
-import { _ as y, x as m, W as x, X as d, $ as t, a0 as r, a1 as l, a9 as _, a3 as n, a6 as u, a2 as c, a4 as p, d as h, a5 as g, F as f, a7 as v, ab as w } from "./asWebComponent-C2Gm8JDg.js";
-import { V as k } from "./VMain-D7s76eFm.js";
+import { _ as y, x as m, W as x, X as d, $ as t, a0 as r, a1 as l, a9 as _, a3 as n, a6 as u, a2 as c, a4 as p, d as h, a5 as g, F as f, a7 as v, ab as w } from "./asWebComponent-Ddg71BJk.js";
+import { V as k } from "./VMain-Ubv9jyyL.js";
 class A extends HTMLElement {
   static get observedAttributes() {
     return ["gap"];

package/dist/client/{DynamicWebComponent-DSY-5Ke4.js → DynamicWebComponent-TrDsJuF8.js}

@@ -1,5 +1,5 @@
-import { bE as i, aA as m, r as p, Z as d, aM as f, $ as c, a6 as g, a0 as y, d as _, a4 as k } from "./asWebComponent-C2Gm8JDg.js";
-const h = { class: "d-flex flex-column fill-height overflow-auto" }, E = {
+import { bF as i, aA as m, r as p, Z as d, aM as f, $ as c, a6 as g, a0 as y, d as _, a4 as k } from "./asWebComponent-Ddg71BJk.js";
+const h = { class: "d-flex flex-column fill-height overflow-auto" }, N = {
   __name: "DynamicWebComponent",
   props: {
     link: {
@@ -53,5 +53,5 @@ const h = { class: "d-flex flex-column fill-height overflow-auto" }, E = {
   }
 };
 export {
-  E as default
+  N as default
 };

package/dist/client/{EodashDatePicker-C6VRIC7r.js → EodashDatePicker-CkA9rHp6.js}

@@ -1,7 +1,7 @@
-import { p as B, o as $, g as _, y as j, av as I, c as v, r as V, d as h, a as M, b as p, aw as R, ax as O, T as U, ay as F, x as H, Z as N, az as Y, aA as z, w as G, $ as w, a6 as W, a1 as y, a3 as C, aB as K, F as L, W as Z, a9 as k, aC as q, aD as J, t as S, a0 as T, M as D, aE as Q, V as P, aF as X, aG as x, aH as tt } from "./asWebComponent-C2Gm8JDg.js";
-import { t as et, e as at } from "./helpers-VeeVIAhm.js";
-import { m as ot, V as E } from "./VOverlay-DdGIY0gS.js";
-import { b as nt, f as st } from "./forwardRefs-BFBakSKN.js";
+import { p as B, o as $, g as _, y as j, av as I, c as v, r as V, d as h, a as M, b as p, aw as R, ax as O, T as U, ay as F, x as H, Z as N, az as Y, aA as z, w as G, $ as w, a6 as W, a1 as y, a3 as C, aB as K, F as L, W as Z, a9 as k, aC as q, aD as J, t as S, a0 as T, M as D, aE as Q, V as P, aF as X, aG as x, aH as tt } from "./asWebComponent-Ddg71BJk.js";
+import { t as et, e as at } from "./helpers-BCawTwFg.js";
+import { m as ot, V as E } from "./VOverlay-CqZC2CbA.js";
+import { b as nt, f as st } from "./forwardRefs-OX_5lLJW.js";
 const rt = B({
   id: String,
   text: String,