@eodash/eodash 5.3.3 → 5.5.0

package/dist/client/{handling-CbgeKrqT.js → handling-DSA67d6E.js}

@@ -1,8 +1,8 @@
 import log from 'loglevel';
-import { s as separateEndpointLinks, c as createTiffLayerDefinition, p as pollProcessStatus, e as extractAsyncResults, u as updateJobsStatus, a as creatAsyncProcessLayerDefinitions, g as getBboxProperty, b as generateTimePairs, f as updateJsonformSchemaTarget, h as extractGeometries, i as applyProcessLayersToMap } from './async-D1MvO_Z_.js';
-import { j as axios, a as extractLayerConfig, H as compareIndicator, F as indicator, x as extractCollectionUrls, G as currentCompareUrl, A as currentUrl, y as generateLinksFromItems, n as getDatetimeProperty, B as datetime, I as comparePoi, C as poi } from './helpers-CtUlAW0N.js';
+import { s as separateEndpointLinks, c as createTiffLayerDefinition, p as pollProcessStatus, e as extractAsyncResults, u as updateJobsStatus, a as creatAsyncProcessLayerDefinitions, b as getBboxProperty, f as generateTimePairs, h as updateJsonformSchemaTarget, i as extractGeometries, j as applyProcessLayersToMap, g as getDrawToolsProperty } from './async-D6Lvv-fT.js';
+import { d as axios, b as extractLayerConfig, I as compareIndicator, G as indicator, y as extractCollectionUrls, H as currentCompareUrl, B as currentUrl, z as generateLinksFromItems, o as getDatetimeProperty, J as comparePoi, C as datetime, w as getLayers, Z as compareChartData, _ as chartData, O as compareChartSpec, N as chartSpec, D as poi } from './helpers-BBSdbOmv.js';
 import mustache from 'mustache';
-import { Q as isFirstLoad, E as useSTAcStore, S as readParquetItems, T as useGetSubCodeId } from './asWebComponent-DdguWGDI.js';
+import { Q as isFirstLoad, E as useSTAcStore, T as readParquetItems, U as useGetSubCodeId } from './asWebComponent-DaIxULaA.js';
 import { toAbsolute } from 'stac-js/src/http.js';
 
 ////// --- CHARTS --- //////
@@ -17,7 +17,7 @@ import { toAbsolute } from 'stac-js/src/http.js';
  * @param {Record<string,any>} options.jsonformSchema
  * @param {import("vue").Ref<import("../types").AsyncJob[]>} options.jobs
  * @param {boolean} [options.enableCompare=false] - Whether to enable compare mode
- * @returns {Promise<[import("@eox/chart").EOxChart["spec"] | null,Record<string,any>|null]>}
+ * @returns {Promise<[import("vega-embed").VisualizationSpec | null,Record<string,any>|null]>}
  **/
 async function processCharts({
   links,
@@ -61,10 +61,48 @@ async function processCharts({
   if (data && data.length) {
     //@ts-expect-error we assume data to exist in spec
     spec.data.values = data;
-    return [spec, dataValues];
+    return [structuredClone(spec), structuredClone(dataValues)];
   }
-
   const dataLinks = standardLinks.filter((link) => link.rel === "service");
+
+  // We count if there are at least two application/json links, if yes,
+  // we download the data and assign them to specific data ids in the spec
+  const jsonLinks = dataLinks.filter(
+    (link) => link.type === "application/json",
+  );
+  if (jsonLinks.length >= 2) {
+    for (const link of jsonLinks ?? []) {
+      let linkType = link.type;
+      switch (linkType) {
+        case undefined:
+          continue;
+        case "application/json":
+          dataValues[/** @type {string} */ (link.id)] = await axios
+            .get(
+              mustache.render(link.href, {
+                ...(jsonformValue ?? {}),
+              }),
+            )
+            .then((resp) => resp.data);
+          // assign to spec datasets, assuming spec.data is InlineData
+          // Always assign values as an object with string keys
+          if (spec.data) {
+            /** @type {import("vega-lite/build/src/data").InlineData} */
+            (spec.data).values = {
+              ...(spec.data &&
+              "values" in spec.data &&
+              typeof spec.data.values === "object"
+                ? spec.data.values
+                : {}),
+              [/** @type {string} */ (link.id)]:
+                dataValues[/** @type {string} */ (link.id)],
+            };
+          }
+          break;
+      }
+    }
+    return [spec, dataValues];
+  }
   try {
     checkForData: for (const link of dataLinks ?? []) {
       switch (link.type) {
@@ -91,7 +129,7 @@ async function processCharts({
   } catch (e) {
     console.error("[eodash] Error while injecting Vega data", e);
   }
-  return [spec, dataValues];
+  return [structuredClone(spec), structuredClone(dataValues)];
 }
 
 /**
@@ -797,7 +835,9 @@ async function handleVedaEndpoint({
   enableCompare = false,
 }) {
   const vedaLink = links.find(
-    (link) => link.rel === "service" && link.endpoint === "veda",
+    (link) =>
+      link.rel === "service" &&
+      (link.endpoint === "veda" || link.endpoint === "veda_stac"),
   );
   if (!vedaLink) {
     return;
@@ -810,12 +850,17 @@ async function handleVedaEndpoint({
   const configs = await fetchVedaCOGsConfig(
     selectedStac,
     enableCompare ? currentCompareUrl.value : currentUrl.value,
+    vedaLink,
   );
   // TODO: convert jsonform bbox type to geojson in the schema to avoid the conversion here
   return await Promise.all(
     configs.map(({ endpoint, datetime }) => {
+      const url = new URL(vedaEndpoint);
+      const key = vedaLink.endpoint === "veda_stac" ? "ids" : "url";
+      url.searchParams.set(key, endpoint);
+
       return axios
-        .post(vedaEndpoint + `?url=${endpoint}`, {
+        .post(url.toString(), {
           ...{
             type: "Feature",
             properties: {},
@@ -841,8 +886,9 @@ async function handleVedaEndpoint({
  * Fetches the COGs endpoints from the STAC collections
  * @param {import("stac-ts").StacCollection} selectedStac
  * @param {string} absoluteUrl
+ * @param {import("stac-ts").StacLink} vedaLink
  */
-async function fetchVedaCOGsConfig(selectedStac, absoluteUrl) {
+async function fetchVedaCOGsConfig(selectedStac, absoluteUrl, vedaLink) {
   // retrieve the collections from the indicator
   const collectionLinks = selectedStac.links.filter(
     (link) => link.rel == "child",
@@ -888,10 +934,15 @@ async function fetchVedaCOGsConfig(selectedStac, absoluteUrl) {
     );
     const itemLinks = collection.links.filter((link) => link.rel == "item");
     configs.push(
-      ...itemLinks.map((link) => ({
-        endpoint: /** @type {string} */ (link["cog_href"]),
-        datetime: /** @type string **/ (link[datetimeProperty]),
-      })),
+      ...itemLinks.map((link) => {
+        const endpoint = /** @type {string} */ (
+          vedaLink.endpoint === "veda_stac" ? link.id : link["cog_href"]
+        );
+        return {
+          endpoint,
+          datetime: /** @type string **/ (link[datetimeProperty]),
+        };
+      }),
     );
   }
 
@@ -956,7 +1007,6 @@ function createCustomChartEndpointsHandler(callbacks) {
  * @param {import("vue").Ref<import("stac-ts").StacCollection | null>} params.selectedStac
  * @param {import("vue").Ref<import("@eox/jsonform").EOxJSONForm | null>} params.jsonformEl
  * @param {import("vue").Ref<Record<string,any> | null>} params.jsonformSchema
- * @param {import("vue").Ref<import("@eox/chart").EOxChart["spec"] | null>} params.chartSpec
  * @param {import("vue").Ref<any[]>} params.processResults
  * @param {import("vue").Ref<boolean>} params.isProcessed
  * @param {import("vue").Ref<boolean>} params.loading
@@ -967,7 +1017,6 @@ async function initProcess({
   selectedStac,
   jsonformEl,
   jsonformSchema,
-  chartSpec,
   isProcessed,
   processResults,
   loading,
@@ -990,14 +1039,21 @@ async function initProcess({
   resetProcess({
     loading,
     isProcessed,
-    chartSpec,
     jsonformSchema,
     isPolling,
     processResults,
+    enableCompare,
   });
 
   await jsonformEl.value?.editor.destroy();
   if (updatedJsonform) {
+    // make sure correct target layer id is used in jsonform
+    if (updatedJsonform.properties?.feature?.options?.drawtools?.layerId) {
+      await updateJsonformIdentifier({
+        jsonformSchema,
+        newLayers: await getLayers(),
+      });
+    }
     if (enableCompare) {
       updatedJsonform = updateJsonformSchemaTarget(updatedJsonform);
     }
@@ -1005,6 +1061,74 @@ async function initProcess({
   }
 }
 
+/**
+ * Update the jsonform schema to have the correct layer id from the map
+ *
+ * @export
+ * @async
+ * @param {Object} params
+ * @param {import("vue").Ref<Record<string,any> | null>} params.jsonformSchema params.jsonformSchema
+ * @param {Record<string, any>[] | undefined} params.newLayers params.newLayers
+ */
+async function updateJsonformIdentifier({ jsonformSchema, newLayers }) {
+  const form = jsonformSchema.value;
+  if (!form) {
+    return;
+  }
+  const drawToolsProperty = getDrawToolsProperty(form);
+  if (
+    drawToolsProperty &&
+    newLayers &&
+    form?.properties[drawToolsProperty]?.options?.drawtools?.layerId
+  ) {
+    // get partial or full id and try to match with correct eoxmap layer
+    // check if newLayers is an array or an object with layers property
+    let layers = newLayers;
+    // @ts-expect-error TODO payload coming from time update sometimes is not an object with layers property
+    if (newLayers.layers && Array.isArray(newLayers.layers)) {
+      // @ts-expect-error TODO payload coming from time update sometimes is not an object with layers property
+      layers = newLayers.layers;
+    }
+
+    const layerId =
+      form.properties[drawToolsProperty].options.drawtools.layerId.split(
+        ";:;",
+      )[0];
+    let matchedLayerId = null;
+    // layers are not flat can be grouped, we need to recursively search
+    const traverseLayers = (
+      /** @type {Record<string, any>[] | undefined} */ layersArray,
+    ) => {
+      if (!layersArray) {
+        return;
+      }
+      for (const layer of layersArray) {
+        if (layer.layers) {
+          // @ts-expect-error TODO payload coming from time update events is not an object with layers property
+          traverseLayers(layer);
+        } else {
+          if (layer.properties?.id?.startsWith(layerId)) {
+            matchedLayerId = layer.properties.id;
+            break;
+          }
+        }
+      }
+    };
+    traverseLayers(layers);
+    if (matchedLayerId) {
+      form.properties.feature.options.drawtools.layerId = matchedLayerId;
+      // trigger jsonform update in next tick
+      jsonformSchema.value = null;
+      await new Promise((resolve) => setTimeout(resolve, 0));
+      jsonformSchema.value = form;
+    } else {
+      throw new Error(
+        `Could not find matching layer for processing form with id: ${layerId}`,
+      );
+    }
+  }
+}
+
 /**
  *
  * @param {object} params
@@ -1012,8 +1136,6 @@ async function initProcess({
  * @param {import("vue").Ref<import("stac-ts").StacCollection | null>} params.selectedStac
  * @param {import("vue").Ref<import("@eox/jsonform").EOxJSONForm | null>} params.jsonformEl
  * @param {import("vue").Ref<Record<string,any>|null>} params.jsonformSchema
- * @param {import("vue").Ref<import("@eox/chart").EOxChart["spec"] | null>} params.chartSpec
- * @param {import("vue").Ref<Record<string, any> | null>} params.chartData
  * @param {import("vue").Ref<boolean>} params.isPolling
  * @param {import("vue").Ref<any[]>} params.processResults
  * @param {import("@eox/map").EOxMap | null} params.mapElement
@@ -1024,8 +1146,6 @@ async function handleProcesses({
   selectedStac,
   jsonformEl,
   jsonformSchema,
-  chartSpec,
-  chartData,
   isPolling,
   processResults,
   mapElement,
@@ -1034,6 +1154,7 @@ async function handleProcesses({
   if (!jsonformEl.value || !jsonformSchema.value || !selectedStac.value) {
     return;
   }
+  const enableCompare = mapElement?.id === "compare";
 
   log.debug("Processing...");
   loading.value = true;
@@ -1055,12 +1176,14 @@ async function handleProcesses({
       selectedStac.value?.["eodash:vegadefinition"]
     );
     const layerId = selectedStac.value?.id ?? "";
-
-    [chartSpec.value, chartData.value] = await processCharts({
+    const usedChartSpec = enableCompare ? compareChartSpec : chartSpec;
+    const usedChartData = enableCompare ? compareChartData : chartData;
+    let tempChartSpec = null;
+    [tempChartSpec, usedChartData.value] = await processCharts({
       links: serviceLinks,
       jsonformValue: { ...(jsonformValue ?? {}) },
       jsonformSchema: jsonformSchema.value,
-      enableCompare: mapElement?.id === "compare",
+      enableCompare,
       selectedStac: selectedStac.value,
       specUrl,
       isPolling,
@@ -1068,19 +1191,19 @@ async function handleProcesses({
       customEndpointsHandler: handleChartCustomEndpoints,
     });
 
-    if (Object.keys(chartData.value ?? {}).length) {
-      processResults.value.push(chartData.value);
+    if (Object.keys(usedChartData.value ?? {}).length) {
+      processResults.value.push(usedChartData.value);
     }
 
     //@ts-expect-error we assume that the spec data is of type InlineData
-    if (chartSpec.value?.data?.values?.length) {
+    if (tempChartSpec.data?.values?.length) {
       //@ts-expect-error we assume that the spec data is of type InlineData
-      processResults.value.push(chartSpec.value?.data.values);
+      processResults.value.push(tempChartSpec?.data.values);
     }
-
-    if (chartSpec.value && !("background" in chartSpec.value)) {
-      chartSpec.value["background"] = "transparent";
+    if (tempChartSpec && !("background" in tempChartSpec)) {
+      tempChartSpec["background"] = "transparent";
     }
+    usedChartSpec.value = tempChartSpec;
 
     await processSTAC(
       serviceLinks,
@@ -1131,23 +1254,24 @@ async function handleProcesses({
  * @param {Object} params
  * @param {import("vue").Ref<boolean>} params.loading
  * @param {import("vue").Ref<boolean>} params.isProcessed
- * @param {import("vue").Ref<import("@eox/chart").EOxChart["spec"] | null>} params.chartSpec
  * @param {import("vue").Ref<boolean>} params.isPolling
  * @param {import("vue").Ref<any[]>} params.processResults
  * @param {import("vue").Ref<Record<string,any>|null>} params.jsonformSchema
+ * @param {boolean} params.enableCompare
  */
 function resetProcess({
   loading,
   isProcessed,
-  chartSpec,
   jsonformSchema,
   processResults,
   isPolling,
+  enableCompare,
 }) {
   loading.value = false;
   isProcessed.value = false;
   isPolling.value = false;
-  chartSpec.value = null;
+  const usedChartSpec = enableCompare ? compareChartSpec : chartSpec;
+  usedChartSpec.value = null;
   processResults.value = [];
   jsonformSchema.value = null;
 }
@@ -1166,8 +1290,7 @@ const onChartClick = (evt) => {
   const chartSpec = evt.target?.spec;
   if (
     !chartSpec ||
-    !evt.detail?.item?.datum ||
-    !evt.detail?.item?.datum.datum
+    (!evt.detail?.item?.datum && !evt.detail?.item?.datum.datum)
   ) {
     return;
   }
@@ -1230,4 +1353,4 @@ const loadPOiIndicator = () => {
   }
 };
 
-export { handleProcesses as h, initProcess as i, loadPOiIndicator as l, onChartClick as o };
+export { handleProcesses as h, initProcess as i, loadPOiIndicator as l, onChartClick as o, updateJsonformIdentifier as u };