Skip to content

Commit

Permalink
Revert "Color maps range slider implementation (#1190)"
Browse files Browse the repository at this point in the history
This reverts commit 233a31c, reversing
changes made to 46e1c5d.
  • Loading branch information
snmln committed Oct 29, 2024
1 parent c83bce5 commit ebcaff6
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 575 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ interface RasterPaintLayerProps extends BaseGeneratorParams {
colorMap?: string | undefined;
tileParams: Record<string, any>;
generatorPrefix?: string;
reScale?: { min: number; max: number };
}

export function RasterPaintLayer(props: RasterPaintLayerProps) {
Expand All @@ -25,23 +24,16 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {
hidden,
opacity,
colorMap,
reScale,
generatorPrefix = 'raster'
generatorPrefix = 'raster',
} = props;

const { updateStyle } = useMapStyle();
const [minZoom] = zoomExtent ?? [0, 20];
const generatorId = `${generatorPrefix}-${id}`;

const updatedTileParams = useMemo(() => {
return {
...tileParams,
...(colorMap && {
colormap_name: colorMap
}),
...(reScale && { rescale: Object.values(reScale) })
};
}, [tileParams, colorMap, reScale]);
return { ...tileParams, ...colorMap && {colormap_name: colorMap}};
}, [tileParams, colorMap]);

//
// Generate Mapbox GL layers and sources for raster timeseries
Expand All @@ -55,9 +47,7 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {

useEffect(
() => {
const tileParamsAsString = qs.stringify(updatedTileParams, {
arrayFormat: 'comma'
});
const tileParamsAsString = qs.stringify(updatedTileParams, { arrayFormat: 'comma' });

const zarrSource: RasterSource = {
type: 'raster',
Expand All @@ -73,8 +63,8 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {
paint: {
'raster-opacity': hidden ? 0 : rasterOpacity,
'raster-opacity-transition': {
duration: 320
}
duration: 320,
},
},
minzoom: minZoom,
metadata: {
Expand Down Expand Up @@ -103,8 +93,7 @@ export function RasterPaintLayer(props: RasterPaintLayerProps) {
tileApiEndpoint,
haveTileParamsChanged,
generatorParams,
colorMap,
reScale
colorMap
// generatorParams includes hidden and opacity
// hidden,
// opacity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
stacApiEndpoint,
tileApiEndpoint,
colorMap,
reScale
} = props;

const { current: mapInstance } = useMaps();

const theme = useTheme();
const { updateStyle } = useMapStyle();

Expand Down Expand Up @@ -270,9 +270,7 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
controller
});
const mosaicUrl = responseData.links[1].href;
setMosaicUrl(
mosaicUrl.replace('/{tileMatrixSetId}', '/WebMercatorQuad')
);
setMosaicUrl(mosaicUrl.replace('/{tileMatrixSetId}', '/WebMercatorQuad'));
} catch (error) {
// @NOTE: conditional logic TO BE REMOVED once new BE endpoints have moved to prod... Fallback on old request url if new endpoints error with nonexistance...
if (error.request) {
Expand All @@ -286,14 +284,10 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
const mosaicUrl = responseData.links[1].href;
setMosaicUrl(mosaicUrl);
} else {
LOG &&
LOG &&
/* eslint-disable-next-line no-console */
console.log(
'Titiler /register %cEndpoint error',
'color: red;',
error
);
throw error;
console.log('Titiler /register %cEndpoint error', 'color: red;', error);
throw error;
}
}

Expand Down Expand Up @@ -367,8 +361,7 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
{
assets: 'cog_default',
...(sourceParams ?? {}),
...(colorMap && { colormap_name: colorMap }),
...(reScale && {rescale: Object.values(reScale)})
...colorMap && {colormap_name: colorMap}
},
// Temporary solution to pass different tile parameters for hls data
{
Expand Down Expand Up @@ -496,7 +489,6 @@ export function RasterTimeseries(props: RasterTimeseriesProps) {
}, [
mosaicUrl,
colorMap,
reScale,
points,
minZoom,
haveSourceParamsChanged,
Expand Down
1 change: 0 additions & 1 deletion app/scripts/components/common/map/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ export interface BaseTimeseriesProps extends BaseGeneratorParams {
zoomExtent?: number[];
onStatusChange?: (result: { status: ActionStatus; id: string }) => void;
colorMap?: string;
reScale?: { min: number; max: number };
}

// export interface ZarrTimeseriesProps extends BaseTimeseriesProps {
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/components/common/uswds/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ export { USWDSAlert } from './alert';
export { USWDSButtonGroup, USWDSButton } from './button';
export { USWDSLink } from './link';
export { USWDSBanner, USWDSBannerContent } from './banner';

export { USWDSTextInput, USWDSTextInputMask } from './input';
10 changes: 0 additions & 10 deletions app/scripts/components/common/uswds/input.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions app/scripts/components/exploration/atoms/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,6 @@ export function useTimelineDatasetColormap(
return useAtom(colorMapAtom);
}

export function useTimelineDatasetColormapScale(
datasetAtom: PrimitiveAtom<TimelineDataset>
) {
const colorMapScaleAtom = useMemo(() => {
return focusAtom(datasetAtom, (optic) =>
optic.prop('settings').prop('scale')
);
}, [datasetAtom]);

return useAtom(colorMapScaleAtom);
}
export const useTimelineDatasetAnalysis = (
datasetAtom: PrimitiveAtom<TimelineDataset>
) => {
Expand Down

This file was deleted.

Loading

0 comments on commit ebcaff6

Please sign in to comment.