@eodash/eodash 5.3.2 → 5.4.0

package/core/client/eodashSTAC/helpers.js

@@ -42,13 +42,14 @@ export function generateFeatures(links, extraProperties = {}, rel = "item") {
 }
 
 /**
- * Sperates and extracts layerConfig (jsonform schema & legend) from a style json
+ * Spearates and extracts layerConfig (jsonform schema & legend) from a style json
  *
  * @param {string} collectionId
  *  @param { import("@/types").EodashStyleJson} [style]
  * @param {Record<string,any>} [rasterJsonform]
+ * @param {string} [layerConfigType]
  * */
-export function extractLayerConfig(collectionId, style, rasterJsonform) {
+export function extractLayerConfig(collectionId, style, rasterJsonform, layerConfigType) {
   if (!style && !rasterJsonform) {
     return { layerConfig: undefined, style: undefined };
   }
@@ -56,6 +57,10 @@ export function extractLayerConfig(collectionId, style, rasterJsonform) {
     style = { ...style };
   }
 
+  if (style?.variables && Object.keys(style.variables ?? {}).length) {
+    style.variables = getStyleVariablesState(collectionId, style.variables);
+  }
+
   if (rasterJsonform) {
     return {
       layerConfig: {
@@ -67,16 +72,12 @@ export function extractLayerConfig(collectionId, style, rasterJsonform) {
     };
   }
 
-  if (style?.variables && Object.keys(style.variables ?? {}).length) {
-    style.variables = getStyleVariablesState(collectionId, style.variables);
-  }
-
   /** @type {Record<string,unknown> | undefined} */
   let layerConfig = undefined;
 
   if (style?.jsonform) {
     // this explicitly sets legend only if jsonform is configured
-    layerConfig = { schema: style.jsonform, type: "style" };
+    layerConfig = { schema: style.jsonform, type: layerConfigType || "style" };
     delete style.jsonform;
     if (style?.legend) {
       layerConfig.legend = style.legend;
@@ -90,6 +91,7 @@ export function extractLayerConfig(collectionId, style, rasterJsonform) {
 
   return { layerConfig, style };
 }
+
 /**
  *
  * @param {number[]} bbox
@@ -164,28 +166,38 @@ export const extractRoles = (properties, linkOrAsset) => {
 
 /**
  * Extracts a single non-link style JSON from a STAC Item optionally for a selected key mapping
- * @param {import("stac-ts").StacItem} item
- * @param {string} itemUrl
- * @param {string | undefined} key
- * @returns 
+ * @param { import("stac-ts").StacItem | import("stac-ts").StacCollection } stacObject
+ * @param {string | undefined} linkKey
+ * @param {string | undefined} assetKey
+ * @returns
  **/
-export const fetchStyle = async (item, itemUrl, key=undefined) => {
+export const fetchStyle = async (
+  stacObject,
+  linkKey = undefined,
+  assetKey = undefined,
+) => {
   let styleLink = null;
-  if (key) {
-    styleLink = item.links.find((link) => link.rel.includes("style") && link["links:keys"] && /** @type {Array<string>} */ (link["links:keys"]).includes(key) );
+  if (linkKey) {
+    styleLink = stacObject.links.find(
+      (link) =>
+        link.rel.includes("style") &&
+        link["links:keys"] &&
+        /** @type {Array<string>} */ (link["links:keys"]).includes(linkKey),
+    );
+  } else if (assetKey) {
+    styleLink = stacObject.links.find(
+      (link) =>
+        link.rel.includes("style") &&
+        link["asset:keys"] &&
+        /** @type {Array<string>} */ (link["asset:keys"]).includes(assetKey),
+    );
   } else {
-    styleLink = item.links.find((link) => link.rel.includes("style") && !link["links:keys"]);
+    log.debug("Neither link key, nor asset key input, can not match any style to layer.", stacObject.id);
+   return {};
   }
   if (styleLink) {
-    let url = "";
-    if (styleLink.href.startsWith("http")) {
-      url = styleLink.href;
-    } else {
-      url = toAbsolute(styleLink.href, itemUrl);
-    }
-
     /** @type {import("@/types").EodashStyleJson} */
-    const styleJson = await axios.get(url).then((resp) => resp.data);
+    const styleJson = await axios.get(styleLink.href).then((resp) => resp.data);
 
     log.debug("fetched styles JSON", JSON.parse(JSON.stringify(styleJson)));
     return { ...styleJson };
@@ -194,18 +206,15 @@ export const fetchStyle = async (item, itemUrl, key=undefined) => {
 
 /**
  * Fetches all style JSONs from a STAC Item and returns an array with style objects
- * @param {import("stac-ts").StacItem} item
- * @param {string} itemUrl
+ * @param {import("stac-ts").StacItem | import("stac-ts").StacCollection} stacObject
  * @returns { Promise <Array<import("@/types").EodashStyleJson>>}
  **/
-export const fetchAllStyles = async (item, itemUrl) => {
-  const styleLinks = item.links.filter((link) => link.rel.includes("style"));
+export const fetchAllStyles = async (stacObject) => {
+  const styleLinks = stacObject.links.filter((link) =>
+    link.rel.includes("style"),
+  );
   const fetchPromises = styleLinks.map(async (link) => {
-    let url = link.href.startsWith("http")
-      ? link.href
-      : toAbsolute(link.href, itemUrl);
-
-    const styleJson = await axios.get(url).then((resp) => resp.data);
+    const styleJson = await axios.get(link.href).then((resp) => resp.data);
     log.debug("fetched styles JSON", JSON.parse(JSON.stringify(styleJson)));
     return styleJson;
   });
@@ -321,12 +330,11 @@ export const extractLayerTimeValues = (items, currentStep) => {
   };
 };
 
-
 /**
  * Recursively find all layers whose ID up to the first ; is same as given layer
  *
  * @param {import("@eox/map").EoxLayer[]} layers
- * @param {import("@eox/map").EoxLayer | undefined} referenceLayer - layer 
+ * @param {import("@eox/map").EoxLayer | undefined} referenceLayer - layer
  * @returns {import("@eox/map").EoxLayer[]} Matching layer objects.
  */
 export const findLayersByLayerPrefix = (layers, referenceLayer) => {
@@ -390,7 +398,11 @@ export const replaceLayersInStructure = (layers, toRemove, toInsert) => {
   for (const layer of layers) {
     if (layer.type === "Group" && Array.isArray(layer.layers)) {
       // Recurse into group layers
-      const newGroupLayers = replaceLayersInStructure(layer.layers, toRemove, toInsert);
+      const newGroupLayers = replaceLayersInStructure(
+        layer.layers,
+        toRemove,
+        toInsert,
+      );
       result.push({ ...layer, layers: newGroupLayers });
       continue;
     }
@@ -418,7 +430,6 @@ export const replaceLayersInStructure = (layers, toRemove, toInsert) => {
   return result;
 };
 
-
 /**
  * Removes the layer with the id provided and injects an array of layers in its position
  * @param {import("@eox/map").EoxLayer[]} currentLayers
@@ -459,15 +470,11 @@ export const replaceLayer = (currentLayers, oldLayer, newLayers) => {
  * @param {import('ol/layer').Layer} layer
  */
 export const getColFromLayer = async (indicators, layer) => {
-  const [collectionId, itemId, ..._other] = layer.get("id").split(";:;");
+  const [collectionId, ..._other] = layer.get("id").split(";:;");
 
   for (const ind of indicators) {
     if (ind.collectionStac?.id !== collectionId) continue;
-    const items = await ind.getItems();
-    const itemIds = items?.map(item => item.id || item.datetime) ?? [];
-    if (itemIds.includes(itemId)) {
-      return ind;
-    }
+    return ind;
   }
 };
 
@@ -841,3 +848,18 @@ export function extractLayerLegend(collection) {
   }
   return extraProperties;
 }
+
+
+/**
+ * @param { import ("stac-ts").StacLink } link
+ * @returns {object}
+ */
+export function extractEoxLegendLink(link) {
+  let extraProperties = {};
+  if (link["eox:colorlegend"]) {
+    extraProperties = {
+      layerLegend: link["eox:colorlegend"],
+    };
+  }
+  return extraProperties;
+}

package/core/client/eodashSTAC/parquet.js

@@ -95,6 +95,7 @@ function moveItemProperties(item) {
     "id",
     "collection",
     "properties",
+    "auth:schemes"
   ];
   for (const key in item) {
     if (!stacProperties.includes(key)) {

package/core/client/eodashSTAC/triggers.js

@@ -67,25 +67,25 @@ export function getStyleVariablesState(collectionId, variables) {
       "",
       "",
     ];
-    return (
-      collection === collectionId &&
-      ["Vector", "WebGLTile", "VectorTile"].includes(layer?.type ?? "")
-    );
+    return collection === collectionId;
   });
 
   if (!matchingLayer) {
     return variables;
   }
+  // TODO instead tap into store for changed variables state per layer
+  // because XYZ and WMTS use tileurlfunction update, where we can not retrieve
+  // current values from OL layers anyhow
 
   const olLayer = mapElement.getLayerById(matchingLayer.properties?.id ?? "");
-  const oldVariablesState =
+  let oldVariablesState =
     /** @type {import("ol/layer").Vector} */ (
       olLayer
       //@ts-expect-error variables doesn't exist in non-flat style
     ).getStyle?.()?.variables ??
     //@ts-expect-error (styleVariables_ is a private property)
     /** @type {import("ol/layer").WebGLTile} */ (olLayer).styleVariables_;
-
+  
   if (!oldVariablesState) {
     return variables;
   }
@@ -99,3 +99,4 @@ export function getStyleVariablesState(collectionId, variables) {
     );
   return matchingKeys ? oldVariablesState : variables;
 }
+

package/core/client/store/states.js

@@ -11,7 +11,7 @@ export const currentUrl = ref("");
 export const currentCompareUrl = ref("");
 
 /** Currently selected datetime */
-export const datetime = ref(new Date().toISOString());
+export const datetime = ref("");
 
 /** Currently selected indicator */
 export const indicator = ref("");

package/core/client/types.ts

@@ -465,7 +465,12 @@ export type EodashStyleJson = import("ol/style/flat").FlatStyleLike & {
   variables?: Record<string, string | number | boolean | null | undefined>;
   legend?: import("@eox/layercontrol/src/components/layer-config.js").EOxLayerControlLayerConfig["layerConfig"]["legend"];
   jsonform?: import("json-schema").JSONSchema7;
-  tooltip?: { id: string; title?: string; appendix?: string }[];
+  tooltip?: {
+    id: string;
+    title?: string;
+    appendix?: string;
+    decimals?: number;
+  }[];
 };
 export type EodashRasterJSONForm = {
   jsonform: Record<string, any>;
@@ -476,9 +481,11 @@ export type LayersEventBusKeys =
   | "layers:updated"
   | "time:updated"
   | "process:updated"
+  | "layertime:updated"
   | "compareLayers:updated"
   | "compareTime:updated"
-  | "compareProcess:updated";
+  | "compareProcess:updated"
+  | "compareLayertime:updated";
 
 //// STAC API types
 /** @ignore */
@@ -620,7 +627,6 @@ export interface OAuth2Flow {
   scopes: Record<string, string>;
 }
 
-
 /** Signed URL flow configuration */
 export interface SignedUrlFlow {
   authorizationApi: string;
@@ -638,20 +644,20 @@ export interface SignedUrlFlow {
 }
 
 export interface ApiKeyAuthScheme extends AuthScheme {
-   type: "apiKey",
-   name: string;
-   in: string;
+  type: "apiKey";
+  name: string;
+  in: string;
 }
 
 import { StacItem, StacLink, StacAsset } from "stac-ts";
 export interface StacAuthItem extends StacItem {
   "auth:schemes": {
     [key: string]: AuthScheme;
-  },
+  };
 }
 export interface StacAuthLink extends StacLink {
-  "auth:refs": [string],
+  "auth:refs": [string];
 }
 export interface StacAuthAsset extends StacAsset {
-  "auth:refs": [string],
+  "auth:refs": [string];
 }

package/core/client/utils/states.js

@@ -9,6 +9,10 @@ import {
   mdiSnowflake,
   mdiWater,
   mdiWeatherWindy,
+  mdiAccountMultiple,
+  mdiHiking,
+  mdiVolleyball,
+  mdiWrench,
 } from "@mdi/js";
 import { reactive, ref, shallowReactive } from "vue";
 
@@ -97,10 +101,22 @@ export const dataThemesBrands = {
     icon: mdiWeatherWindy,
     color: "#475faf",
   },
+  climate: {
+    icon: mdiWeatherWindy,
+    color: "#475faf",
+  },
   economy: {
     icon: mdiCurrencyEur,
     color: "#8E81AF",
   },
+  commerce: {
+    icon: mdiCurrencyEur,
+    color: "#8E81AF",
+  },
+  society: {
+    icon: mdiAccountMultiple,
+    color: "#8ac501",
+  },
   biomass: {
     icon: mdiLeaf,
     color: "#009E73",
@@ -109,8 +125,24 @@ export const dataThemesBrands = {
     icon: mdiLightningBolt,
     color: "#a1280a",
   },
+  energy: {
+    icon: mdiLightningBolt,
+    color: "#475faf",
+  },
+  tourism: {
+    icon: mdiHiking,
+    color: "#80510aff",
+  },
+  sport: {
+    icon: mdiVolleyball,
+    color: "#e98e65ff",
+  },
   cryosphere: {
     icon: mdiSnowflake,
     color: "#42C7B8",
   },
+  industry: {
+    icon: mdiWrench,
+    color: "#8d845cff",
+  },
 };

package/dist/client/{DashboardLayout-BHQnHqWW.js → DashboardLayout-CQOGHPW_.js}

@@ -1,7 +1,7 @@
 import { createBlock, openBlock, withCtx, createElementVNode, unref, createElementBlock, createCommentVNode, normalizeStyle, Suspense, resolveDynamicComponent, mergeProps, Fragment, renderList, Transition } from 'vue';
 import '@eox/layout';
-import { _ as _export_sfc, u as useDefineTemplate } from './asWebComponent-Dptqds6-.js';
-import { V as VMain } from './VMain-CniQR94B.js';
+import { _ as _export_sfc, u as useDefineTemplate } from './asWebComponent-Bw03Jutr.js';
+import { V as VMain } from './VMain-C74l1bv-.js';
 
 const _style_0 = ".panel[data-v-9c8477cc]{position:relative;overflow:auto;z-index:1;pointer-events:none}.pointer[data-v-9c8477cc]{pointer-events:all}.bg-panel[data-v-9c8477cc]{z-index:0;border-radius:0!important}.fade-enter-active[data-v-9c8477cc],.fade-leave-active[data-v-9c8477cc]{transition:opacity .25s ease}.fade-enter-from[data-v-9c8477cc],.fade-leave-to[data-v-9c8477cc]{opacity:0}.bg-surface[data-v-9c8477cc],.bg-primary[data-v-9c8477cc]{backdrop-filter:blur(10px)!important;border-radius:8px;border:none;box-shadow:0 0 1px #18274b38,0 6px 12px -6px #18274b1f,0 8px 24px -4px #18274b14;max-height:100%;overflow:auto;scrollbar-color:rgba(var(--v-theme-on-surface),.2) transparent;scrollbar-width:thin}.bg-surface[data-v-9c8477cc]{background-color:rgba(var(--v-theme-surface),var(--v-surface-opacity, .8))!important}.bg-primary[data-v-9c8477cc]{background-color:rgba(var(--v-theme-primary),var(--v-primary-opacity, .8))!important}";
 

package/dist/client/{DynamicWebComponent-B4PdeZ9P.js → DynamicWebComponent-CoLO8FEf.js}

@@ -1,5 +1,5 @@
 import { withAsyncContext, ref, onMounted, onUnmounted, createElementBlock, openBlock, createBlock, resolveDynamicComponent, mergeProps } from 'vue';
-import { E as useSTAcStore } from './asWebComponent-Dptqds6-.js';
+import { E as useSTAcStore } from './asWebComponent-Bw03Jutr.js';
 
 const _hoisted_1 = { class: "d-flex flex-column fill-height overflow-auto" };
 

package/dist/client/{EodashDatePicker-Ch_AXVas.js → EodashDatePicker-BZeQ6bcu.js}

@@ -1,11 +1,11 @@
 import { useCssVars, ref, useTemplateRef, customRef, computed, reactive, watch, onMounted, createElementBlock, openBlock, createVNode, unref, createSlots, withCtx, createElementVNode, withDirectives, createCommentVNode, createBlock, mergeProps, toHandlers } from 'vue';
 import { DatePicker } from 'v-calendar';
-import { _ as _export_sfc, D as useDisplay, E as useSTAcStore, F as useTransparentPanel, G as VBtn, H as VIcon, I as eodashCollections, J as eodashCompareCollections } from './asWebComponent-Dptqds6-.js';
-import { B as datetime } from './helpers-DoQGyrvY.js';
+import { _ as _export_sfc, D as useDisplay, E as useSTAcStore, F as useTransparentPanel, G as VBtn, H as VIcon, I as eodashCollections, J as eodashCompareCollections } from './asWebComponent-Bw03Jutr.js';
+import { C as datetime } from './helpers-CsjKHAcK.js';
 import { mdiRayEndArrow, mdiRayStartArrow } from '@mdi/js';
 import log from 'loglevel';
 import { storeToRefs } from 'pinia';
-import { T as Tooltip } from './index-DTxo2ysK.js';
+import { T as Tooltip } from './index-DEmHaCL3.js';
 
 const _style_0 = ".vc-popover-content{--vc-nav-hover-bg: rgba(var(--v-theme-on-surface), .1);--vc-nav-item-active-color: rgb(var(--v-theme-on-secondary));--vc-nav-item-active-bg: rgba(var(--v-theme-secondary), .8);--vc-focus-ring: 0 0 0 2px rgba(var(--v-theme-secondary), .5)}.vc-container{--vc-day-content-hover-bg: rgba(var(--v-theme-on-surface), .2);--vc-focus-ring: 0 0 0 2px rgba(var(--v-theme-secondary), .4);--vc-header-arrow-hover-bg: rgba(var(--v-theme-secondary), .1)}.vc-attr{--vc-accent-600: rgba(var(--v-theme-secondary), .8)}.datePicker{--vc-day-content-hover-bg: red}@media (min-width: 960px){.datePicker{position:absolute;bottom:0;left:0;right:0;margin-inline:auto;width:fit-content}}.vc-day-content{color:#5e5e5e;font-weight:400}.vc-highlight-content-solid{color:#fff!important}.vc-popover-content-wrapper{transform:var(--v5270a4d4)!important}.vc-date-picker-content,.datePicker{backdrop-filter:blur(10px)!important;border-radius:8px;border:none;box-shadow:0 0 1px #18274b38,0 6px 12px -6px #18274b1f,0 8px 24px -4px #18274b14;background-color:rgba(var(--v-theme-surface),var(--v-surface-opacity, .8))!important}.vc-popover-caret.direction-top.align-left{clip-path:polygon(0% 0%,100% 0%,0% 100%,0% 100%)}.vc-bordered{border:none}";
 

package/dist/client/{EodashItemFilter-lTuzCl08.js → EodashItemFilter-CmZkk7GK.js}

@@ -1,5 +1,5 @@
 import { withAsyncContext, computed, ref, createElementBlock, openBlock, mergeProps, unref, createElementVNode, toDisplayString } from 'vue';
-import { _ as _export_sfc, E as useSTAcStore, Q as isFirstLoad } from './asWebComponent-Dptqds6-.js';
+import { _ as _export_sfc, E as useSTAcStore, Q as isFirstLoad } from './asWebComponent-Bw03Jutr.js';
 
 const _style_0 = "eox-itemfilter[data-v-88d0abc7]{--form-flex-direction: row}@media (max-width: 768px){eox-itemfilter[data-v-88d0abc7]{--form-flex-direction: column}}";
 

package/dist/client/{EodashLayerControl-CBSGRlIi.js → EodashLayerControl-D54fY-bX.js}

@@ -1,8 +1,8 @@
 import { withAsyncContext, computed, ref, createElementBlock, openBlock, createCommentVNode, mergeProps, unref, renderSlot, createElementVNode, toDisplayString } from 'vue';
 import 'color-legend-element';
 import '@eox/timecontrol';
-import { N as mapCompareEl, h as mapEl, O as getColFromLayer } from './helpers-DoQGyrvY.js';
-import { _ as _export_sfc, E as useSTAcStore, M as layerControlFormValueCompare, N as layerControlFormValue, J as eodashCompareCollections, I as eodashCollections } from './asWebComponent-Dptqds6-.js';
+import { O as mapCompareEl, j as mapEl, P as getColFromLayer } from './helpers-CsjKHAcK.js';
+import { _ as _export_sfc, E as useSTAcStore, M as layerControlFormValueCompare, N as layerControlFormValue, J as eodashCompareCollections, I as eodashCollections } from './asWebComponent-Bw03Jutr.js';
 import { storeToRefs } from 'pinia';
 
 /**

package/dist/client/{EodashLayoutSwitcher-DdwQYoI4.js → EodashLayoutSwitcher-BCP3FvDb.js}

@@ -1,8 +1,8 @@
 import { ref, createElementBlock, openBlock, createBlock, unref, withCtx, createVNode, mergeProps } from 'vue';
-import { D as activeTemplate } from './helpers-DoQGyrvY.js';
+import { E as activeTemplate } from './helpers-CsjKHAcK.js';
 import { mdiViewDashboard } from '@mdi/js';
-import { D as useDisplay, F as useTransparentPanel, H as VIcon } from './asWebComponent-Dptqds6-.js';
-import { V as VTooltip } from './VTooltip-D5dnTfem.js';
+import { D as useDisplay, F as useTransparentPanel, H as VIcon } from './asWebComponent-Bw03Jutr.js';
+import { V as VTooltip } from './VTooltip-BLS-cQ9N.js';
 
 const _sfc_main = {
   __name: 'EodashLayoutSwitcher',