Skip to content

Commit

Permalink
Use sourceparams as it is when it is there (#1148)
Browse files Browse the repository at this point in the history
**Related Ticket:** _{link related ticket here}_

### Description of Changes
While working on render extension talk, I realized that the authors
don't necessarily use array format for rescale value (ex. rescale value
for hls-ndvi layer in this file:
https://raw.githubusercontent.com/NASA-IMPACT/veda-config/develop/datasets/hls-ndvi-ian.data.mdx
is string `-1,1`) To support what we have now, I think we should return
the source parameter as it is.

### Notes & Questions About Changes
I also simplified the logic a little bit, please check if I am missing
anything!
  • Loading branch information
hanbyul-here authored Sep 13, 2024
2 parents cecafa7 + 778d327 commit 98cc2d7
Showing 1 changed file with 14 additions and 22 deletions.
36 changes: 14 additions & 22 deletions app/scripts/components/exploration/data-utils-no-faux-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,35 +174,27 @@ export function resolveRenderParams(
datasetSourceParams: Record<string, any> | undefined,
queryDataRenders: Record<string, any> | undefined
): Record<string, any> | undefined {
let renderParams: Record<string, any> | undefined;
// Start with sourceParams from the dataset.
// Return the source param as it is if exists
if (hasValidSourceParams(datasetSourceParams)) {
renderParams = datasetSourceParams;
return datasetSourceParams;
}

// Check for the dashboard render configuration in queryData if not defined.
if (!renderParams && queryDataRenders?.dashboard) {
renderParams = queryDataRenders.dashboard;
// Check for the dashboard render configuration in queryData
if (!queryDataRenders) throw new Error ('No render parameter exists from stac endpoint.');

if (renderParams?.rescale) {
renderParams.rescale = flattenAndCalculateMinMax([renderParams.rescale]);
}
}

// Check for asset-specific renders using the sourceParams' assets property.
if (!renderParams && queryDataRenders?.[datasetSourceParams?.assets]) {
renderParams = queryDataRenders[datasetSourceParams?.assets];
// Check the namespace from render extension
const renderKey = queryDataRenders.dashboard? 'dashboard' : datasetSourceParams?.assets;
if (!queryDataRenders[renderKey]) throw new Error ('No proper render parameter for dashboard namespace exists.');

if (renderParams?.rescale) {
renderParams.rescale = flattenAndCalculateMinMax(renderParams.rescale);
}
}

if (renderParams?.rescale) {
renderParams.rescale = flattenAndCalculateMinMax(renderParams.rescale);
// Return the render extension parameter
if (queryDataRenders[renderKey] && hasValidSourceParams(queryDataRenders[renderKey])) {
const renderParams = queryDataRenders[renderKey];
return {
...renderParams,
rescale: flattenAndCalculateMinMax([renderParams.rescale])
};
}

return renderParams;
}

export function getTimeDensityStartDate(date: Date, timeDensity: TimeDensity) {
Expand Down

0 comments on commit 98cc2d7

Please sign in to comment.