@eodash/eodash 5.1.0 → 5.2.0

package/widgets/EodashProcess/ProcessList.vue

@@ -17,7 +17,14 @@
       <tbody>
         <tr v-for="item in currentJobs" :key="item.jobID">
           <td>
-            {{ new Date(item.job_start_datetime).toISOString().slice(0, 16) }}
+            <a
+              class="processUrl"
+              target="_blank"
+              :href="getJobStatusUrl(item.jobID, currentIndicator)"
+              >{{
+                new Date(item.job_start_datetime).toISOString().slice(0, 16)
+              }}</a
+            >
           </td>
           <td>{{ item.status }}</td>
           <td style="padding: 0px">
@@ -73,6 +80,7 @@ import {
   downloadPreviousResults,
   loadProcess,
   updateJobsStatus,
+  getJobStatusUrl,
 } from "./methods/async";
 import { useOnLayersUpdate } from "@/composables";
 import { compareJobs, jobs } from "./states";
@@ -103,4 +111,8 @@ div.v-table__wrapper {
   overflow: hidden !important;
   height: max-content !important;
 }
+.processUrl {
+  text-decoration: none;
+  color: var(--v-theme-primary);
+}
 </style>

package/widgets/EodashProcess/methods/async.js

@@ -150,7 +150,15 @@ export const downloadPreviousResults = async (jobObject, selectedStac) => {
     .get(link.href)
     .then((response) => response.data)
     .then((data) => {
-      results.push(...data.urls);
+      // either urls is an Array
+      if (data.urls) {
+        results.push(...data.urls);
+      } else {
+        // or urls need to be aggregated from mapping objects
+        for (const outputMappingObject of Object.values(data)) {
+          results.push(...outputMappingObject.urls);
+        }
+      }
     });
   results.forEach((result) => {
     if (!result) {
@@ -225,3 +233,16 @@ export async function loadPreviousProcess({
   log.debug("rendered layers after loading previous process:", layers);
   applyProcessLayersToMap(mapElement, layers);
 }
+
+/**
+ * extracts job status url from local storage based on identifier
+ *
+ * @param {string} jobID
+ * @param {string} indicator
+ */
+export const getJobStatusUrl = (jobID, indicator) => {
+  /** @type {string[]} */
+  const jobsUrls = JSON.parse(localStorage.getItem(indicator) || "[]");
+  const jobUrl = jobsUrls.find((url) => url.includes(jobID));
+  return jobUrl;
+};

package/widgets/EodashProcess/methods/custom-endpoints/chart/veda-endpoint.js

@@ -2,7 +2,8 @@ import axios from "@/plugins/axios";
 import { getBboxProperty } from "../../utils";
 import { toAbsolute } from "stac-js/src/http.js";
 import { currentCompareUrl, currentUrl } from "@/store/states";
-import { getDatetimeProperty } from "@/eodashSTAC/helpers";
+import { getDatetimeProperty, generateLinksFromItems } from "@/eodashSTAC/helpers";
+import { readParquetItems } from "@/eodashSTAC/parquet";
 
 /**
  * @param {import("^/EodashProcess/types").CustomEnpointInput} inputs
@@ -75,7 +76,22 @@ async function fetchVedaCOGsConfig(selectedStac, absoluteUrl) {
         collectionLinks.map((link) =>
           axios
             .get(toAbsolute(link.href, absoluteUrl))
-            .then((resp) => resp.data),
+            .then((resp) => resp.data)
+            .then(async (collection) => {
+              // items in geoparquet handling specially to get item links
+              const parquetAsset = Object.values(collection.assets ?? {}).find(
+                (asset) =>
+                  asset.type === "application/vnd.apache.parquet" &&
+                asset.roles?.includes("collection-mirror"),
+              );
+              if (parquetAsset) {
+                const parquetAbsoluteUrl = toAbsolute(parquetAsset.href, toAbsolute(link.href, absoluteUrl));
+                await readParquetItems(parquetAbsoluteUrl).then((items) => {
+                  collection.links.push(...generateLinksFromItems(items));
+                });
+              }
+              return collection;
+            }),
         ),
       )),
     );
@@ -86,7 +102,7 @@ async function fetchVedaCOGsConfig(selectedStac, absoluteUrl) {
     const datetimeProperty = /** @type string **/ (
       getDatetimeProperty(collection.links)
     );
-    let itemLinks = collection.links.filter((link) => link.rel == "item");
+    const itemLinks = collection.links.filter((link) => link.rel == "item");
     configs.push(
       ...itemLinks.map((link) => ({
         endpoint: /** @type {string} */ (link["cog_href"]),

package/widgets/EodashProcess/methods/utils.js

@@ -3,6 +3,7 @@ import {
   extractLayerConfig,
   mergeGeojsons,
   replaceLayer,
+  extractLayerLegend,
 } from "@/eodashSTAC/helpers";
 import axios from "@/plugins/axios";
 import { getCompareLayers, getLayers } from "@/store/actions";
@@ -290,7 +291,10 @@ export async function creatAsyncProcessLayerDefinitions(
 
   for (const resultItem of processResults) {
     const flatStyleJSON = extractStyleFromResult(resultItem, flatStyles);
-    let style, layerConfig;
+    /** @type {import("@/types").EodashStyleJson | undefined} */
+    let style;
+    /** @type {Record<string, unknown> | undefined}  */
+    let layerConfig;
     if (flatStyleJSON) {
       const extracted = extractLayerConfig(
         selectedStac?.id ?? "",
@@ -300,6 +304,9 @@ export async function creatAsyncProcessLayerDefinitions(
       style = extracted.style;
     }
 
+    // Check if collection has eox:colorlegend definition, if yes overwrite legend description
+    let extraProperties = extractLayerLegend(selectedStac);
+
     switch (resultItem.type) {
       case "image/tiff": {
         layers.push({
@@ -313,6 +320,7 @@ export async function creatAsyncProcessLayerDefinitions(
               (resultItem.id ?? ""),
             layerControlToolsExpand: true,
             ...(layerConfig && { layerConfig }),
+            ...extraProperties,
           },
           source: {
             type: "GeoTIFF",
@@ -350,12 +358,48 @@ export async function creatAsyncProcessLayerDefinitions(
                 style,
               },
             }),
+            ...extraProperties,
           },
           ...(!style?.variables && { style }),
           interactions: [],
         });
         break;
       }
+      case "application/vnd.flatgeobuf": {
+        // TODO after more flatgeobuf urls are possible in EOxMap https://github.com/EOX-A/EOxElements/issues/1789
+        // we should change this handler to only create one layer instead of many
+        resultItem.urls.forEach((url, i) => {
+          layers.push({
+            type: "Vector",
+            source: {
+              type: "FlatGeoBuf",
+              url,
+            },
+            properties: {
+              id:
+                endpointLink.id +
+                "_process_" +
+                resultItem.id +
+                postfixId +
+                `_${i}`,
+              title:
+                "Results " +
+                (selectedStac?.id ?? "") +
+                " " +
+                (resultItem.id ?? ""),
+              layerControlToolsExpand: true,
+              ...(layerConfig && {
+                layerConfig: {
+                  ...layerConfig,
+                  style,
+                },
+              }),
+              ...extraProperties,
+            },
+          });
+        });
+        break;
+      }
       default:
         console.warn(
           `[eodash] Unsupported result type "${resultItem.type}" for ${resultItem.id} layer creation.`,

package/dist/client/EodashMapBtns-WoGq8MuV.js

@@ -1,173 +0,0 @@
-import { computed, ref, createElementBlock, openBlock, withDirectives, createCommentVNode, createBlock, createVNode, unref, withCtx, triggerRef } from 'vue';
-import { _ as _export_sfc, Y as useSTAcStore, r as useDisplay, Z as useTransparentPanel, V as VBtn } from './asWebComponent-By_7_JjS.js';
-import { z as activeTemplate, K as availableMapProjection, L as changeMapProjection, y as poi, D as comparePoi, M as setActiveTemplate } from './helpers-Dy0Q13tP.js';
-import { mdiCompareRemove, mdiCompare, mdiMapPlus, mdiEarthBox, mdiStarFourPointsCircleOutline } from '@mdi/js';
-import ExportState from './ExportState-D-iuwaad.js';
-import _sfc_main$1 from './PopUp-BsYLvWch.js';
-import EodashItemFilter from './EodashItemFilter-DPznh8UB.js';
-import { storeToRefs } from 'pinia';
-import { l as loadPOiIndicator } from './handling-CgmFXkW6.js';
-import { T as Tooltip } from './index-Dqj4tbx2.js';
-
-const _style_0 = ".map-btn[data-v-771740c6]{width:36px;height:36px;border-radius:25%;margin:4px}";
-
-const _sfc_main = {
-  __name: 'EodashMapBtns',
-  props: {
-    exportMap: {
-      type: Boolean,
-      default: true,
-    },
-    changeProjection: {
-      type: Boolean,
-      default: true,
-    },
-    compareIndicators: {
-      /** @type {import("vue").PropType<boolean | {compareTemplate?:string;fallbackTemplate?:string}> }*/
-      type: [Boolean, Object],
-      default: true,
-    },
-    backToPOIs: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  setup(__props) {
-
-
-const { selectedStac, selectedCompareStac } = storeToRefs(useSTAcStore());
-const { resetSelectedCompareSTAC } = useSTAcStore();
-const { smAndDown } = useDisplay();
-const popupWidth = computed(() => (smAndDown.value ? "80%" : "70%"));
-const popupHeight = computed(() => (smAndDown.value ? "90%" : "70%"));
-
-const showMapState = ref(false);
-const showCompareIndicators = ref(false);
-const compareIcon = computed(() =>
-  activeTemplate.value ===
-  ((typeof __props.compareIndicators === "object" &&
-    __props.compareIndicators?.compareTemplate) ||
-    "compare")
-    ? mdiCompareRemove
-    : mdiCompare,
-);
-
-const onCompareClick = () => {
-  showCompareIndicators.value = !showCompareIndicators.value;
-
-  const fallbackTemplate =
-    (typeof __props.compareIndicators === "object" &&
-      __props.compareIndicators.fallbackTemplate) ||
-    "expert";
-  selectedCompareStac.value = null;
-  resetSelectedCompareSTAC();
-  setActiveTemplate(fallbackTemplate);
-  triggerRef(selectedStac);
-};
-
-/** @type {import("vue").Ref<HTMLDivElement|null>} */
-const rootRef = ref(null);
-
-const onSelectCompareIndicator = () => {
-  const compareTemplate =
-    (typeof __props.compareIndicators === "object" &&
-      __props.compareIndicators.compareTemplate) ||
-    "compare";
-  setActiveTemplate(compareTemplate);
-  showCompareIndicators.value = !showCompareIndicators.value;
-};
-
-useTransparentPanel(rootRef);
-
-return (_ctx, _cache) => {
-                                                     
-                                                         
-
-  return (openBlock(), createElementBlock("div", {
-    ref_key: "rootRef",
-    ref: rootRef,
-    class: "d-flex flex-column align-end"
-  }, [
-    (__props.exportMap)
-      ? withDirectives((openBlock(), createBlock(VBtn, {
-          key: 0,
-          class: "map-btn",
-          icon: [unref(mdiMapPlus)],
-          size: "small",
-          onClick: _cache[0] || (_cache[0] = $event => (showMapState.value = !showMapState.value))
-        }, null, 8 /* PROPS */, ["icon"])), [
-          [Tooltip, 'Extract Storytelling configuration', "bottom"]
-        ])
-      : createCommentVNode("v-if", true),
-    (__props.exportMap)
-      ? (openBlock(), createBlock(ExportState, {
-          key: 1,
-          modelValue: showMapState.value,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = $event => ((showMapState).value = $event))
-        }, null, 8 /* PROPS */, ["modelValue"]))
-      : createCommentVNode("v-if", true),
-    (__props.changeProjection && !!unref(availableMapProjection))
-      ? withDirectives((openBlock(), createBlock(VBtn, {
-          key: 2,
-          class: "map-btn",
-          icon: [unref(mdiEarthBox)],
-          size: "small",
-          onClick: _cache[2] || (_cache[2] = $event => (unref(changeMapProjection)(unref(availableMapProjection))))
-        }, null, 8 /* PROPS */, ["icon"])), [
-          [Tooltip, 'Change map projection', "bottom"]
-        ])
-      : createCommentVNode("v-if", true),
-    (__props.compareIndicators)
-      ? withDirectives((openBlock(), createBlock(VBtn, {
-          key: 3,
-          class: "map-btn",
-          icon: [compareIcon.value],
-          size: "small",
-          onClick: onCompareClick
-        }, null, 8 /* PROPS */, ["icon"])), [
-          [Tooltip, 'Compare mode', "bottom"]
-        ])
-      : createCommentVNode("v-if", true),
-    (__props.backToPOIs && (unref(poi) || unref(comparePoi)))
-      ? withDirectives((openBlock(), createBlock(VBtn, {
-          key: 4,
-          class: "map-btn",
-          icon: [unref(mdiStarFourPointsCircleOutline)],
-          size: "small",
-          onClick: _cache[3] || (_cache[3] = $event => (unref(loadPOiIndicator)()))
-        }, null, 8 /* PROPS */, ["icon"])), [
-          [Tooltip, 'back to POIs', "bottom"]
-        ])
-      : createCommentVNode("v-if", true),
-    createVNode(_sfc_main$1, {
-      modelValue: showCompareIndicators.value,
-      "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => ((showCompareIndicators).value = $event)),
-      maxWidth: popupWidth.value,
-      width: popupWidth.value,
-      "max-height": popupHeight.value,
-      height: popupHeight.value
-    }, {
-      default: withCtx(() => [
-        createVNode(EodashItemFilter, {
-          enableCompare: true,
-          enableHighlighting: false,
-          resultType: "cards",
-          style: {"--select-filter-max-items":"8"},
-          "filters-title": "Select an indicator to compare",
-          subTitleProperty: "subtitle",
-          imageProperty: "thumbnail",
-          aggregateResults: "collection_group",
-          "results-title": "",
-          onSelect: onSelectCompareIndicator
-        })
-      ]),
-      _: 1 /* STABLE */
-    }, 8 /* PROPS */, ["modelValue", "maxWidth", "width", "max-height", "height"])
-  ], 512 /* NEED_PATCH */))
-}
-}
-
-};
-const EodashMapBtns = /*#__PURE__*/_export_sfc(_sfc_main, [['styles',[_style_0]],['__scopeId',"data-v-771740c6"]]);
-
-export { EodashMapBtns as default };