@eodash/eodash 5.6.1 → 5.7.0

package/widgets/EodashProcess/methods/handling.js

@@ -35,6 +35,7 @@ import { getLayers, getCompareLayers } from "@/store/actions";
  * @param {import("vue").Ref<boolean>} params.isProcessed
  * @param {import("vue").Ref<boolean>} params.loading
  * @param {import("vue").Ref<boolean>} params.isPolling
+ * @param {import("@eox/map").EOxMap | null} params.mapElement
  * @param {boolean} params.enableCompare
  */
 export async function initProcess({
@@ -45,6 +46,7 @@ export async function initProcess({
   loading,
   isPolling,
   enableCompare,
+  mapElement,
 }) {
   const isPoiAlive = enableCompare ? !!comparePoi.value : !!poi.value;
   let updatedJsonform = null;
@@ -59,6 +61,27 @@ export async function initProcess({
     jsonformSchema.value = null;
     return;
   }
+
+  if (!updatedJsonform) {
+    resetProcess({
+      loading,
+      isProcessed,
+      jsonformSchema,
+      isPolling,
+      processResults,
+      enableCompare,
+    });
+    return;
+  }
+
+  const newJsonForm = await updateJsonformIdentifier({
+    jsonformSchema: updatedJsonform,
+    newLayers: enableCompare ? getCompareLayers() : getLayers(),
+    enableCompare,
+    mapElement,
+  });
+  if (!newJsonForm) return;
+
   resetProcess({
     loading,
     isProcessed,
@@ -67,99 +90,109 @@ export async function initProcess({
     processResults,
     enableCompare,
   });
+  jsonformSchema.value = newJsonForm;
+}
 
-  if (updatedJsonform) {
-    // make sure correct target layer id is used in jsonform
-    const newJsonForm = await updateJsonformIdentifier({
-      jsonformSchema: updatedJsonform,
-      newLayers: enableCompare ? getCompareLayers() : getLayers(),
-      enableCompare,
-    });
-    // trigger jsonform update in next tick
-    jsonformSchema.value = null;
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    jsonformSchema.value = newJsonForm;
+/**
+ * Recursively search grouped layer tree for a layer whose id starts with the given prefix
+ *
+ * @param {Record<string, any>[]} layers
+ * @param {string} prefix
+ * @returns {string | null}
+ */
+function findLayerIdByPrefix(layers, prefix) {
+  for (const layer of layers) {
+    if (layer.type === "Group" && Array.isArray(layer.layers)) {
+      const found = findLayerIdByPrefix(layer.layers, prefix);
+      if (found) return found;
+    } else if (layer.properties?.id?.startsWith(prefix)) {
+      return layer.properties.id;
+    }
   }
+  return null;
 }
 
 /**
- * Update the jsonform schema to have the correct layer id from the map
+ * Wait until a layer's features are loaded for the drawtools to attach correctly
+ * Resolves immediately if already loaded.
+ *
+ * @param {import("@eox/map").AnyLayerWithSource | null | undefined} layer
+ * @returns {Promise<void>}
+ */
+function waitForLayerRender(layer) {
+  return new Promise((resolve, reject) => {
+    if (!layer || layer.get("type") !== "Vector" || !("getSource" in layer))
+      return resolve();
+    const source = /** @type {import("ol/source/Vector").default} */ (
+      layer.getSource()
+    );
+    if (!source || source.getFeatures().length > 0) return resolve();
+    source.once("featuresloadend", () => resolve());
+    source.once("featuresloaderror", () =>
+      reject(new Error(`Layer ${layer.get("id")} failed to load features`)),
+    );
+  });
+}
+
+/**
+ * Update the jsonform schema to have the correct layer id from the map.
+ * Returns null if any required layerId cannot be resolved (layer not yet in map).
+ * Callers should treat null as "retry when layers:updated fires".
  *
  * @export
- * @async
  * @param {Object} params
- * @param {Record<string,any> | null} params.jsonformSchema params.jsonformSchema
- * @param {Record<string, any>[] | undefined} params.newLayers params.newLayers
- * @param { boolean } params.enableCompare params.enableCompare
- * @returns {Promise<Record<string,any> | null>} updated jsonform schema
+ * @param {Record<string,any> | null} params.jsonformSchema
+ * @param {Record<string, any>[] | undefined} params.newLayers
+ * @param {boolean} params.enableCompare
+ * @param {import("@eox/map").EOxMap | null | undefined} params.mapElement
+ * @returns {Promise<Record<string,any> | null>} updated schema, or null if a layerId could not be resolved
  */
 export async function updateJsonformIdentifier({
   jsonformSchema,
   newLayers,
   enableCompare,
+  mapElement,
 }) {
-  const form = jsonformSchema;
-  if (!form) {
-    return null;
-  }
+  if (!jsonformSchema || !newLayers) return null;
+
+  const form = JSON.parse(JSON.stringify(jsonformSchema));
   const drawToolsProperties = getDrawToolsProperties(form);
-  drawToolsProperties.forEach((drawToolsProperty) => {
-    if (
-      drawToolsProperty &&
-      form?.properties[drawToolsProperty]?.options?.drawtools?.for &&
-      enableCompare
-    ) {
-      form.properties[drawToolsProperty].options.drawtools.for =
-        "eox-map#compare";
+  /** @type {Promise<void>[]} */
+  const renderPromises = [];
+
+  for (const drawToolsProperty of drawToolsProperties) {
+    if (!drawToolsProperty) continue;
+
+    const drawtoolsOptions =
+      form?.properties[drawToolsProperty]?.options?.drawtools;
+    if (!drawtoolsOptions) continue;
+
+    if (drawtoolsOptions.for && enableCompare) {
+      drawtoolsOptions.for = "eox-map#compare";
     }
-    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.type === "Group" && Array.isArray(layer.layers)) {
-            traverseLayers(layer.layers);
-          } else {
-            if (layer.properties?.id?.startsWith(layerId)) {
-              matchedLayerId = layer.properties.id;
-              break;
-            }
-          }
+    if (drawtoolsOptions.layerId) {
+      let layer = mapElement?.getLayerById(drawtoolsOptions.layerId);
+      if (!layer) {
+        const prefix = drawtoolsOptions.layerId.split(";:;")[0];
+        const resolvedId = findLayerIdByPrefix(newLayers, prefix);
+        if (!resolvedId) {
+          console.warn(
+            `Could not find matching layer for processing form with id: ${prefix}`,
+          );
+          return null;
         }
-      };
-      traverseLayers(layers);
-      if (matchedLayerId) {
-        form.properties[drawToolsProperty].options.drawtools.layerId =
-          matchedLayerId;
-      } else {
-        console.warn(
-          `Could not find matching layer for processing form with id: ${layerId}`,
-        );
+        drawtoolsOptions.layerId = resolvedId;
+        layer = mapElement?.getLayerById(resolvedId);
       }
+      renderPromises.push(waitForLayerRender(layer));
     }
+  }
+
+  await Promise.all(renderPromises).catch((err) => {
+    console.warn("[eodash] layer load failed before jsonform attach:", err);
   });
+
   return form;
 }
 

package/widgets/EodashTimeSlider/index.vue

@@ -0,0 +1,152 @@
+<template>
+  <eox-timecontrol
+    v-if="hasMultipleItems"
+    :key="unref(mapEl)"
+    ref="eoxTimecontrol"
+    .for="mapEl"
+    @select="onSelect"
+    titleKey="title"
+    .externalMapRendering="true"
+    .animate="animate"
+    .initDate="initDate"
+  >
+    <div class="d-flex g-10 align-center">
+      <eox-timecontrol-date class="flex-grow-1"></eox-timecontrol-date>
+      <eox-timecontrol-picker
+        .range="false"
+        .showDots="true"
+        .showItems="true"
+        .popup="true"
+      ></eox-timecontrol-picker>
+
+      <eox-itemfilter
+        v-if="filters.length"
+        .inlineMode="true"
+        :showResults="false"
+        .filterProperties="filters"
+      ></eox-itemfilter>
+      <eox-timecontrol-timelapse @export="onExport"></eox-timecontrol-timelapse>
+    </div>
+
+    <eox-timecontrol-timeline class="mt-2"></eox-timecontrol-timeline>
+  </eox-timecontrol>
+</template>
+<script setup>
+import { datetime, mapEl } from "@/store/states";
+import { eodashCollections } from "@/utils/states";
+import "@eox/timecontrol";
+import "@eox/itemfilter";
+
+import { computed, onMounted, ref, unref, useTemplateRef } from "vue";
+import { storeToRefs } from "pinia";
+import { useSTAcStore } from "@/store/stac";
+import { createAnimationLayers } from "./methods";
+
+const { animate } = defineProps({
+  filters: {
+    /** @type {import("vue").PropType<import("@eox/itemfilter").EOxItemFilter["filterProperties"]>} */
+    type: Array,
+    default: () => [],
+  },
+  animate: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+/** @type {import("vue").ShallowRef<HTMLElement>} */
+const timesliderEl = useTemplateRef("eoxTimecontrol");
+
+const startDate = new Date(datetime.value);
+const endDate = new Date(startDate.getTime() + 24 * 60 * 60 * 1000);
+
+const selectedRange = /** @type {import("vue").Ref<[string, string]>} */ (
+  ref([startDate, endDate].map((d) => d.toISOString()))
+);
+const initDate = [startDate.toISOString().split("T")[0]];
+
+const hasMultipleItems = computed(() => {
+  return eodashCollections.some((ec) => {
+    const itemLinks = ec.collectionStac?.links.filter((l) => l.rel === "item");
+    const itemsLink = ec.collectionStac?.links.some((l) => l.rel === "items");
+    return (itemLinks && itemLinks.length > 1) || itemsLink;
+  });
+});
+
+/**
+ * Handles the selection event from the time control component.
+ * It finds the closest item to the "from" selected date
+ * and updates the global datetime state with that item's original date.
+ *
+ * @param {CustomEvent<import("./types").TimelineSelectionEventDetail>} e
+ */
+const onSelect = (e) => {
+  const { selectedItems, date } = e.detail;
+  // Update the selected range with the new dates
+  selectedRange.value = date;
+
+  const allItems = Object.keys(selectedItems ?? {}).flatMap(
+    (id) => selectedItems[id],
+  );
+  if (!allItems.length) {
+    return;
+  }
+  const [from, _to] = date;
+  const fromDate = new Date(from).getTime();
+
+  const closestItem = allItems.reduce((prev, curr) => {
+    const prevDiff = Math.abs(new Date(prev.originalDate).getTime() - fromDate);
+    const currDiff = Math.abs(new Date(curr.originalDate).getTime() - fromDate);
+    return currDiff < prevDiff ? curr : prev;
+  });
+
+  if (closestItem) {
+    datetime.value = closestItem.originalDate;
+  }
+};
+
+const { selectedStac, stacEndpoint } = storeToRefs(useSTAcStore());
+
+/**
+ *
+ * @param {CustomEvent<import("./types").TimelineExportEventDetail>} evt
+ */
+const onExport = async (evt) => {
+  const { generate, selectedRangeItems, filters } = evt.detail;
+
+  if (!stacEndpoint.value) {
+    return;
+  }
+
+  const mapLayers = await createAnimationLayers(
+    stacEndpoint.value,
+    selectedRange.value,
+    selectedRangeItems,
+    selectedStac,
+    filters,
+  );
+
+  if (!mapLayers?.length) {
+    console.warn("[eodash] No map layers generated for the animation.");
+    return;
+  }
+
+  generate({
+    mapLayers,
+  });
+};
+
+onMounted(() => {
+  const parentDiv = timesliderEl.value?.parentElement;
+  const layoutItem = parentDiv?.parentElement;
+  if (parentDiv && layoutItem && animate) {
+    parentDiv.style.overflow = "visible";
+    layoutItem.style.overflow = "visible";
+  }
+});
+</script>
+<style scoped>
+eox-itemfilter {
+  --inline-container-height: 40px;
+}
+</style>

package/widgets/EodashTimeSlider/methods/index.js

@@ -0,0 +1,279 @@
+import { createLayersConfig } from "^/EodashMap/methods/create-layers-config";
+import { eodashCollections } from "@/utils/states";
+import axios from "@/plugins/axios";
+import { mapEl } from "@/store/states";
+import { removeLayers, sanitizeBbox } from "@/eodashSTAC/helpers";
+import { getLayers } from "@/store/actions";
+
+/**
+ * @param {string} stacEndpoint
+ * @param {[string, string]} selectedRange
+ * @param {import("../types").TimelineExportEventDetail["selectedRangeItems"]} selectedRangeItems
+ * @param {import("vue").Ref<import("stac-ts").StacCollection|null>} selectedStac
+ * @param {Record<string, import("../types").Filter>} filters
+ */
+export async function createAnimationLayers(
+  stacEndpoint,
+  selectedRange,
+  selectedRangeItems,
+  selectedStac,
+  filters,
+) {
+  if (eodashCollections[0].isAPI) {
+    return await createAPILayers(
+      stacEndpoint,
+      { min: selectedRange[0], max: selectedRange[1] },
+      mapEl.value?.lonLatExtent,
+      selectedStac,
+      filters,
+    );
+  }
+  const { collections: hiddenCollections, layers: hiddenLayers } =
+    getHiddenLayers([...getLayers()]);
+
+  return await Promise.all(
+    Object.values(selectedRangeItems).flatMap(async (itemSet) => {
+      /** @type {Array<{ layers: Record<string, any>[]; date: string }>} */
+      const mapLayersArr = [];
+      for (const dateItem of itemSet) {
+        await createLayersConfig(
+          selectedStac.value,
+          eodashCollections.filter(
+            (collection) =>
+              !hiddenCollections.includes(collection.collectionStac?.id ?? ""),
+          ),
+          dateItem.originalDate,
+        ).then((layers) => {
+          //@ts-expect-error createLayersConfig is not typed strictly
+          layers = removeLayers(layers, hiddenLayers);
+          //@ts-expect-error createLayersConfig is not typed strictly
+          layers = restoreLayersVisibility(layers);
+          layers = anonimizeLayersCORS(layers);
+          mapLayersArr.push({
+            layers,
+            date: dateItem.originalDate,
+          });
+        });
+      }
+      return mapLayersArr;
+    }),
+  ).then((results) => results.flat());
+}
+/**
+ *
+ * @param {string} stacEndpoint
+ * @param {{min: string, max: string}} date
+ * @param {number[] | undefined} bbox
+ * @param {import("vue").Ref<import("stac-ts").StacCollection|null>} selectedStac
+ * @param {Record<string, import("../types").Filter>} filters
+ * @return {Promise<Array<{ layers: Record<string, any>[]; date: string }>>}
+ */
+async function createAPILayers(
+  stacEndpoint,
+  date = { min: "", max: "" },
+  bbox,
+  selectedStac,
+  filters,
+) {
+  if (!bbox) {
+    return [];
+  }
+  const url = new URL(stacEndpoint + "/search");
+  url.searchParams.set("limit", "100");
+  url.searchParams.set("collections", selectedStac.value?.id ?? "");
+  url.searchParams.set(
+    "datetime",
+    `${new Date(date.min).toISOString()}/${new Date(date.max).toISOString()}`,
+  );
+  url.searchParams.set("bbox", sanitizeBbox(bbox).join(","));
+
+  const stacFilter = buildStacFilters(filters);
+  if (stacFilter) {
+    url.searchParams.set("filter", stacFilter);
+  }
+
+  /** @type {import("stac-ts").StacItem[]} */
+  const items = await axios
+    .get(url.href)
+    .then((res) => res.data.features)
+    .catch((err) => {
+      console.error("[eodash] Error fetching items for animation:", err);
+      return [];
+    });
+  if (!items || !items.length) {
+    console.warn("[eodash] No items found for animation.");
+    return [];
+  }
+  const { collections: hiddenCollections, layers: hiddenLayers } =
+    getHiddenLayers([...getLayers()]);
+  return await Promise.all(
+    items.map(async (item) => {
+      /** @type {Array<{ layers: Record<string, any>[]; date: string }>} */
+      const mapLayersArr = [];
+      await createLayersConfig(
+        selectedStac.value,
+        eodashCollections.filter(
+          (collection) =>
+            !hiddenCollections.includes(collection.collectionStac?.id ?? ""),
+        ),
+        item,
+      ).then((layers) => {
+        //@ts-expect-error createLayersConfig is not typed strictly
+        layers = removeLayers(layers, hiddenLayers);
+        //@ts-expect-error createLayersConfig is not typed strictly
+        layers = restoreLayersVisibility(layers);
+        layers = anonimizeLayersCORS(layers);
+        mapLayersArr.push({
+          layers,
+          date: /** @type {string} */ (item.properties.datetime),
+        });
+        return mapLayersArr;
+      });
+      return mapLayersArr;
+    }),
+  ).then((results) => results.flat());
+}
+/**
+ *
+ * @param {Record<string, any>[]} layers
+ * @returns {Record<string, any>[]}
+ */
+export function anonimizeLayersCORS(layers) {
+  return layers.map((layer) => {
+    if (layer.type === "Group") {
+      layer.layers = anonimizeLayersCORS(layer.layers);
+      return layer;
+    }
+    if (layer.source) {
+      layer.source.crossOrigin = "anonymous";
+    }
+    return layer;
+  });
+}
+/**
+ * returns the list of layers that has visibility hidden
+ * @param {import("@eox/map").EoxLayer[]} layers
+ * @returns {{ collections: string[]; layers: string[] }}
+ */
+export function getHiddenLayers(layers) {
+  /** @type {{ collections: string[]; layers: string[] }} */
+  const result = { collections: [], layers: [] };
+
+  for (const layer of layers) {
+    // check inner layers if it's a group layer first
+    if (layer.type === "Group" && Array.isArray(layer.layers)) {
+      const childResult = getHiddenLayers(layer.layers);
+      for (const col of childResult.collections) {
+        if (!result.collections.includes(col)) {
+          result.collections.push(col);
+        }
+      }
+      for (const lyr of childResult.layers) {
+        if (!result.layers.includes(lyr)) {
+          result.layers.push(lyr);
+        }
+      }
+    }
+
+    if (!layer.properties?.id) {
+      continue;
+    }
+
+    const olLayer = mapEl.value?.getLayerById(layer.properties?.id);
+    if (!olLayer) {
+      continue;
+    }
+
+    if (olLayer.getVisible() === false) {
+      const refId = layer.properties.id;
+      if (refId) {
+        if (refId.includes(";:;")) {
+          // Check if this looks like a typical eodash collection ID with separator
+          const parts = refId.split(";:;");
+          if (parts.length > 2) {
+            const prefix = parts[0];
+            if (!result.collections.includes(prefix)) {
+              result.collections.push(prefix);
+            }
+          } else {
+            // It has a separator but might just be a base layer like `layerId;:;EPSG`
+            if (!result.layers.includes(refId)) {
+              result.layers.push(refId);
+            }
+          }
+        } else {
+          if (!result.layers.includes(refId)) {
+            result.layers.push(refId);
+          }
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Iterates through a list of layers and updates layer.properties.visible to true
+ * if it is set to false
+ * @param {import("@eox/map").EoxLayer[]} layers
+ * @returns {import("@eox/map").EoxLayer[]}
+ */
+export function restoreLayersVisibility(layers) {
+  for (const layer of layers) {
+    if (layer.properties && layer.properties.visible === false) {
+      layer.properties.visible = true;
+    }
+
+    if (layer.type === "Group" && Array.isArray(layer.layers)) {
+      restoreLayersVisibility(layer.layers);
+    }
+  }
+  return layers;
+}
+
+/**
+ * Build STAC API filter string from TimeSlider filters
+ * @param {Record<string, import("../types").Filter>} filters
+ * @returns {string}
+ */
+export function buildStacFilters(filters) {
+  if (!filters) return "";
+
+  /** @type {string[]} */
+  const stacFilters = [];
+
+  Object.values(filters).forEach((filter) => {
+    if (!filter || !filter.key) return;
+
+    // strip 'properties.' from key if present
+    const propName = filter.key.startsWith("properties.")
+      ? filter.key.replace("properties.", "")
+      : filter.key;
+
+    if (filter.type === "range" && filter.state) {
+      if (
+        filter.state.min !== undefined &&
+        filter.state.min > (filter.min ?? -Infinity)
+      ) {
+        stacFilters.push(`${propName}>=${filter.state.min}`);
+      }
+      if (
+        filter.state.max !== undefined &&
+        filter.state.max < (filter.max ?? Infinity)
+      ) {
+        stacFilters.push(`${propName}<=${filter.state.max}`);
+      }
+    } else if (filter.type === "multiselect" && filter.stringifiedState) {
+      if (filter.stringifiedState.length > 0) {
+        stacFilters.push(`${propName} IN (${filter.stringifiedState})`);
+      }
+    } else if (filter.type === "select" && filter.stringifiedState) {
+      if (filter.stringifiedState) {
+        stacFilters.push(`${propName}='${filter.stringifiedState}'`);
+      }
+    }
+  });
+
+  return stacFilters.join(" AND ");
+}