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.

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

Restrict dynamic colormaps to applicable layer types #1183

Merged
merged 2 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
29 changes: 25 additions & 4 deletions app/scripts/components/exploration/data-utils-no-faux-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,18 @@ const hasValidSourceParams = (params) => {
return params && 'colormap_name' in params && 'rescale' in params;
};

/**
* Utility to check if render parameters are applicable based on dataset type.
*
* @param datasetType The type of the dataset (e.g., 'vector').
* @returns Boolean indicating if render parameters are applicable.
*/
export const isRenderParamsApplicable = (datasetType: string): boolean => {
dzole0311 marked this conversation as resolved.
Show resolved Hide resolved
const nonApplicableTypes = ['vector'];

return !nonApplicableTypes.includes(datasetType);
};

/**
* Util to flatten and process rescale values,
*
Expand Down Expand Up @@ -182,14 +194,23 @@ export function resolveRenderParams(
}

// Check for the dashboard render configuration in queryData
if (!queryDataRenders) throw new Error ('No render parameter exists from stac endpoint.');
if (!queryDataRenders)
throw new Error('No render parameter exists from stac endpoint.');

// 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.');
const renderKey = queryDataRenders.dashboard
? 'dashboard'
: datasetSourceParams?.assets;
if (!queryDataRenders[renderKey])
throw new Error(
'No proper render parameter for dashboard namespace exists.'
);

// Return the render extension parameter
if (queryDataRenders[renderKey] && hasValidSourceParams(queryDataRenders[renderKey])) {
if (
queryDataRenders[renderKey] &&
hasValidSourceParams(queryDataRenders[renderKey])
) {
const renderParams = queryDataRenders[renderKey];
return {
...renderParams,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
} from '../types.d.ts';
import {
resolveLayerTemporalExtent,
resolveRenderParams
resolveRenderParams,
isRenderParamsApplicable
} from '../data-utils-no-faux-module';
import { useEffectPrevious } from '$utils/use-effect-previous';
import { SetState } from '$types/aliases';
Expand Down Expand Up @@ -47,18 +48,22 @@ function reconcileQueryDataWithDataset(
if (queryData.status === DatasetStatus.SUCCESS) {
const domain = resolveLayerTemporalExtent(base.data.id, queryData.data);

const renderParams = resolveRenderParams(
base.data.sourceParams,
queryData.data.renders
);
let renderParams;

if (isRenderParamsApplicable(base.data.type)) {
renderParams = resolveRenderParams(
base.data.sourceParams,
queryData.data.renders
);
}

base = {
...base,
data: {
...base.data,
...queryData.data,
domain,
sourceParams: renderParams
...(renderParams && { sourceParams: renderParams })
}
};
}
Expand Down
Loading