Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use sourceparams as it is when it is there #1148

Merged
merged 3 commits into from
Sep 13, 2024
Merged

Use sourceparams as it is when it is there #1148

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1ed6b8
Use sourceparams as it is when it is there
hanbyul-here Sep 11, 2024
c4d137b
Reflect comments
hanbyul-here Sep 12, 2024
778d327
Change error message per case
hanbyul-here Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions app/scripts/components/exploration/data-utils-no-faux-module.ts
View file
Open in desktop
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
Loading