diff --git a/app/scripts/components/exploration/data-utils-no-faux-module.ts b/app/scripts/components/exploration/data-utils-no-faux-module.ts index 3bf0d5c66..79bda5f3f 100644 --- a/app/scripts/components/exploration/data-utils-no-faux-module.ts +++ b/app/scripts/components/exploration/data-utils-no-faux-module.ts @@ -174,35 +174,27 @@ export function resolveRenderParams( datasetSourceParams: Record | undefined, queryDataRenders: Record | undefined ): Record | undefined { - let renderParams: Record | 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) {