Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-4158: Add user-adjustable day-range slider for multi-day imagery aggregation

Victor Gonzalez Leon9bc48bc3b84b
diff --git a/config/default/common/config/wv.json/layers/multi-mission/opera/OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1.json b/config/default/common/config/wv.json/layers/multi-mission/opera/OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1.json
index 20c602e36..6dd72d968 100644
--- a/config/default/common/config/wv.json/layers/multi-mission/opera/OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1.json
+++ b/config/default/common/config/wv.json/layers/multi-mission/opera/OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1.json
@@ -3,6 +3,7 @@
"OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1": {
"id": "OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1",
"enableCMRDataFinder": true,
+ "maxDayRange": 12,
"description": "multi-mission/opera/OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1",
"tags": "asf asfdaac rtc synthetic aperture radar backscatter opera",
"group": "overlays",
diff --git a/config/default/common/config/wv.json/layers/nisar/NISAR_L2_Geocoded_Polarimetric_Covariance.json b/config/default/common/config/wv.json/layers/nisar/NISAR_L2_Geocoded_Polarimetric_Covariance.json
index 5c0b89506..bcb84ba5d 100644
--- a/config/default/common/config/wv.json/layers/nisar/NISAR_L2_Geocoded_Polarimetric_Covariance.json
+++ b/config/default/common/config/wv.json/layers/nisar/NISAR_L2_Geocoded_Polarimetric_Covariance.json
@@ -5,6 +5,7 @@
"title": "NISAR Normalized Radar Backscatter (False Color) PROVISIONAL",
"subtitle": "NISAR GCOV",
"enableCMRDataFinder": true,
+ "maxDayRange": 12,
"description": "nisar/NISAR_L2_Geocoded_Polarimetric_Covariance",
"tags": "asf asfdaac synthetic aperture radar backscatter nisar",
"group": "overlays",
diff --git a/schemas/layer-config.json b/schemas/layer-config.json
index 8c91f56a3..b5662cb64 100644
--- a/schemas/layer-config.json
+++ b/schemas/layer-config.json
@@ -275,6 +275,10 @@
"type": "number",
"minimum": 1
},
+ "maxDayRange": {
+ "type": "number",
+ "minimum": 1
+ },
"ongoing": {
"type": "boolean"
},
diff --git a/web/js/components/layer/settings/day-range-slider.js b/web/js/components/layer/settings/day-range-slider.js
new file mode 100644
index 000000000..d980b7ee0
--- /dev/null
+++ b/web/js/components/layer/settings/day-range-slider.js
@@ -0,0 +1,63 @@
+import PropTypes from 'prop-types';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import HoverTooltip from '../../util/hover-tooltip';
+import useDebouncedSliderValue from '../../util/use-debounced-slider-value';
+import util from '../../../util/util';
+import { MIN_DAY_COUNT } from '../../../modules/layers/constants';
+
+function DayRangeSlider(props) {
+ const {
+ layer,
+ dayCount,
+ maxDayRange,
+ isMobile,
+ updateDayCount,
+ } = props;
+
+ const [value, onSlide] = useDebouncedSliderValue(
+ dayCount,
+ (val) => updateDayCount(layer.id, val),
+ );
+
+ const infoId = `day-range-info-${util.encodeId(layer.id)}`;
+
+ return (
+ <div className="layer-day-range-select settings-component">
+ <div className="d-flex">
+ <h2 className="wv-header">Days to Aggregate</h2>
+ <FontAwesomeIcon id={infoId} icon="info-circle" className="ms-2" widthAuto />
+ <HoverTooltip
+ target={infoId}
+ placement="right"
+ isMobile={isMobile}
+ labelText="Number of consecutive days of imagery composited together, ending on the selected date."
+ />
+ </div>
+ <input
+ type="range"
+ className="form-range"
+ min={MIN_DAY_COUNT}
+ max={maxDayRange}
+ step={1}
+ value={value}
+ onChange={(e) => onSlide(parseInt(e.target.value, 10))}
+ style={{
+ '--value-percent': `${((value - MIN_DAY_COUNT) / (maxDayRange - MIN_DAY_COUNT)) * 100}%`,
+ }}
+ />
+ <div className="wv-label wv-label-day-range mt-1">
+ {value === 1 ? '1 day' : `${value} days`}
+ </div>
+ </div>
+ );
+}
+
+DayRangeSlider.propTypes = {
+ layer: PropTypes.object,
+ dayCount: PropTypes.number,
+ maxDayRange: PropTypes.number,
+ isMobile: PropTypes.bool,
+ updateDayCount: PropTypes.func,
+};
+
+export default DayRangeSlider;
diff --git a/web/js/components/layer/settings/day-range-slider.test.js b/web/js/components/layer/settings/day-range-slider.test.js
new file mode 100644
index 000000000..f36be2f06
--- /dev/null
+++ b/web/js/components/layer/settings/day-range-slider.test.js
@@ -0,0 +1,103 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+jest.mock('../../../modules/layers/constants', () => ({
+ MIN_DAY_COUNT: 1,
+}));
+jest.mock('@fortawesome/react-fontawesome', () => ({
+ FontAwesomeIcon: () => <span data-testid="fa-icon" />,
+}));
+jest.mock('../../util/hover-tooltip', () => function MockHoverTooltip() { return null; });
+
+import DayRangeSlider from './day-range-slider';
+
+const defaultProps = {
+ layer: { id: 'OPERA_L2_Radiometric_Terrain_Corrected_SAR_Sentinel-1' },
+ dayCount: 1,
+ maxDayRange: 12,
+ isMobile: false,
+ updateDayCount: jest.fn(),
+};
+
+const renderSlider = (overrides = {}) => {
+ const props = { ...defaultProps, ...overrides };
+ return render(<DayRangeSlider {...props} />);
+};
+
+beforeEach(() => {
+ jest.clearAllMocks();
+ jest.useFakeTimers();
+});
+
+afterEach(() => {
+ jest.runOnlyPendingTimers();
+ jest.useRealTimers();
+});
+
+describe('DayRangeSlider', () => {
+ describe('layout', () => {
+ it('renders the Days to Aggregate heading', () => {
+ renderSlider();
+ expect(screen.getByText('Days to Aggregate')).toBeInTheDocument();
+ });
+
+ it('renders the info icon', () => {
+ renderSlider();
+ expect(screen.getByTestId('fa-icon')).toBeInTheDocument();
+ });
+
+ it('renders the range input', () => {
+ renderSlider();
+ expect(screen.getByRole('slider')).toBeInTheDocument();
+ });
+
+ it('displays "1 day" (singular) when dayCount is 1', () => {
+ renderSlider({ dayCount: 1 });
+ expect(screen.getByText('1 day')).toBeInTheDocument();
+ });
+
+ it('displays "N days" (plural) when dayCount is greater than 1', () => {
+ renderSlider({ dayCount: 5 });
+ expect(screen.getByText('5 days')).toBeInTheDocument();
+ });
+ });
+
+ describe('range input attributes', () => {
+ it('sets min to MIN_DAY_COUNT (1)', () => {
+ renderSlider();
+ expect(screen.getByRole('slider')).toHaveAttribute('min', '1');
+ });
+
+ it('sets max to the maxDayRange prop', () => {
+ renderSlider({ maxDayRange: 12 });
+ expect(screen.getByRole('slider')).toHaveAttribute('max', '12');
+ });
+
+ it('sets value to the dayCount prop', () => {
+ renderSlider({ dayCount: 7 });
+ expect(screen.getByRole('slider')).toHaveAttribute('value', '7');
+ });
+ });
+
+ describe('onChange', () => {
+ it('updates the displayed label immediately on slide', () => {
+ renderSlider({ dayCount: 1 });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '8' } });
+ expect(screen.getByText('8 days')).toBeInTheDocument();
+ });
+
+ it('debounces the call to updateDayCount', () => {
+ const updateDayCount = jest.fn();
+ renderSlider({ updateDayCount });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '4' } });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '9' } });
+ expect(updateDayCount).not.toHaveBeenCalled();
+ act(() => {
+ jest.runAllTimers();
+ });
+ expect(updateDayCount).toHaveBeenCalledTimes(1);
+ expect(updateDayCount).toHaveBeenCalledWith(defaultProps.layer.id, 9);
+ });
+ });
+});
diff --git a/web/js/components/layer/settings/layer-settings.js b/web/js/components/layer/settings/layer-settings.js
index daccb9f86..03c2ad19c 100644
--- a/web/js/components/layer/settings/layer-settings.js
+++ b/web/js/components/layer/settings/layer-settings.js
@@ -13,6 +13,7 @@ import AssociatedLayers from './associated-layers-toggle';
import PaletteThreshold from './palette-threshold';
import GranuleLayerDateList from './granule-date-list';
import GranuleCountSlider from './granule-count-slider';
+import DayRangeSlider from './day-range-slider';
import safeLocalStorage from '../../../util/local-storage';
import ImagerySearch from './imagery-search';
@@ -30,6 +31,8 @@ import {
import {
getGranuleLayer,
getGranulePlatform,
+ getMaxDayRange,
+ getLayerDayCount,
} from '../../../modules/layers/selectors';
import {
setThresholdRangeSquashAndNoClip,
@@ -51,6 +54,7 @@ import {
updateGranuleLayerOptions as updateGranuleLayerOptionsAction,
resetGranuleLayerDates as resetGranuleLayerDatesAction,
setOpacity as setOpacityAction,
+ updateDayCount as updateDayCountAction,
} from '../../../modules/layers/actions';
import ClassificationToggle from './classification-toggle';
@@ -79,6 +83,10 @@ function LayerSettings(props) {
customPalettesIsActive,
palettedAllowed,
zot,
+ maxDayRange,
+ dayCount,
+ updateDayCount,
+ isMobile,
} = props;
const [activeIndex, setActiveIndex] = useState(0);
@@ -316,6 +324,15 @@ function LayerSettings(props) {
setOpacity={setOpacity}
layer={layer}
/>
+ {!!maxDayRange && (
+ <DayRangeSlider
+ layer={layer}
+ dayCount={dayCount}
+ maxDayRange={maxDayRange}
+ isMobile={isMobile}
+ updateDayCount={updateDayCount}
+ />
+ )}
{renderGranuleSettings()}
{renderCustomizations}
{titilerLayer && <BandSelection layer={layer} />}
@@ -342,10 +359,16 @@ function mapStateToProps(state, ownProps) {
granuleOptions.granulePlatform = getGranulePlatform(state);
}
+ const maxDayRange = getMaxDayRange(ownProps.layer);
+ const dayCount = maxDayRange ? getLayerDayCount(state, ownProps.layer.id) : undefined;
+
return {
paletteOrder: config.paletteOrder,
granuleOptions,
groupName,
+ maxDayRange,
+ dayCount,
+ isMobile: screenSize.isMobileDevice,
screenHeight: screenSize.screenHeight,
customPalettesIsActive: !!config.features.customPalettes,
globalTemperatureUnit,
@@ -410,6 +433,9 @@ const mapDispatchToProps = (dispatch) => ({
resetGranuleLayerDates: (id) => {
dispatch(resetGranuleLayerDatesAction(id));
},
+ updateDayCount: (id, dayCount) => {
+ dispatch(updateDayCountAction(id, dayCount));
+ },
});
export default connect(
@@ -433,6 +459,10 @@ LayerSettings.propTypes = {
globalTemperatureUnit: PropTypes.string,
groupName: PropTypes.string,
layer: PropTypes.oneOfType([PropTypes.object, PropTypes.oneOf(['null'])]),
+ maxDayRange: PropTypes.number,
+ dayCount: PropTypes.number,
+ isMobile: PropTypes.bool,
+ updateDayCount: PropTypes.func,
palettedAllowed: PropTypes.bool,
paletteOrder: PropTypes.oneOfType([PropTypes.array, PropTypes.oneOf(['null'])]),
palettesTranslate: PropTypes.func,
diff --git a/web/js/components/layer/settings/layer-settings.test.js b/web/js/components/layer/settings/layer-settings.test.js
index 02b53464b..be6221542 100644
--- a/web/js/components/layer/settings/layer-settings.test.js
+++ b/web/js/components/layer/settings/layer-settings.test.js
@@ -9,6 +9,7 @@ jest.mock('./palette-threshold', () => function MockPaletteThreshold() { return
jest.mock('./classification-toggle', () => function MockClassificationToggle() { return <div data-testid="classification-toggle" />; });
jest.mock('./granule-date-list', () => function MockGranuleDateList() { return <div data-testid="granule-date-list" />; });
jest.mock('./granule-count-slider', () => function MockGranuleCountSlider() { return <div data-testid="granule-count-slider" />; });
+jest.mock('./day-range-slider', () => function MockDayRangeSlider() { return <div data-testid="day-range-slider" />; });
jest.mock('./imagery-search', () => function MockImagerySearch() { return <div data-testid="imagery-search" />; });
jest.mock('./associated-layers-toggle', () => function MockAssociatedLayers() { return <div data-testid="associated-layers" />; });
jest.mock('./band-selection/band-selection-parent-info-menu', () => function MockBandSelection() { return <div data-testid="band-selection" />; });
@@ -29,6 +30,8 @@ jest.mock('../../../modules/layers/selectors', () => ({
getGranuleLayer: jest.fn(() => null),
getGranulePlatform: jest.fn(() => 'Terra'),
getActiveLayersMap: jest.fn(() => ({})),
+ getMaxDayRange: jest.fn(() => 0),
+ getLayerDayCount: jest.fn(() => 1),
}));
jest.mock('../../../modules/vector-styles/selectors', () => ({ getVectorStyle: jest.fn() }));
jest.mock('../../../modules/palettes/actions', () => ({
@@ -47,6 +50,7 @@ jest.mock('../../../modules/layers/actions', () => ({
updateGranuleLayerOptions: jest.fn(() => ({ type: 'UPDATE_GRANULE' })),
resetGranuleLayerDates: jest.fn(() => ({ type: 'RESET_GRANULE' })),
setOpacity: jest.fn(() => ({ type: 'SET_OPACITY' })),
+ updateDayCount: jest.fn(() => ({ type: 'UPDATE_DAY_COUNT' })),
}));
import LayerSettings from './layer-settings';
diff --git a/web/js/components/sidebar/layer-row-slider.js b/web/js/components/sidebar/layer-row-slider.js
new file mode 100644
index 000000000..9466c13eb
--- /dev/null
+++ b/web/js/components/sidebar/layer-row-slider.js
@@ -0,0 +1,85 @@
+import { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Tooltip } from 'reactstrap';
+import useDebouncedSliderValue from '../util/use-debounced-slider-value';
+
+function LayerRowSlider(props) {
+ const {
+ sliderId,
+ min,
+ max,
+ value: propValue,
+ unitLabel,
+ tooltipText,
+ onChange,
+ isMobile,
+ stopDndActivation,
+ } = props;
+
+ const [value, onSlide, isSliding] = useDebouncedSliderValue(propValue, onChange);
+ const [isHovered, setIsHovered] = useState(false);
+
+ const pillId = `${sliderId}-pill`;
+ const pillText = `${value} ${unitLabel}${value === 1 ? '' : 'S'}`;
+
+ return (
+ <>
+ <div
+ className="layer-row-slider"
+ onPointerDown={stopDndActivation}
+ onMouseDown={stopDndActivation}
+ onKeyDown={(e) => e.stopPropagation()}
+ onClick={stopDndActivation}
+ >
+ <input
+ type="range"
+ className="form-range form-range-compact"
+ id={sliderId}
+ min={min}
+ max={max}
+ step={1}
+ value={value}
+ aria-label={`${unitLabel} count`}
+ onChange={(e) => onSlide(parseInt(e.target.value, 10))}
+ style={{
+ '--value-percent': `${((value - min) / (max - min)) * 100}%`,
+ }}
+ />
+ </div>
+ <span
+ id={pillId}
+ className="day-range-pill badge rounded-pill text-light bg-dark"
+ onMouseEnter={() => setIsHovered(true)}
+ onMouseLeave={() => setIsHovered(false)}
+ >
+ {pillText}
+ </span>
+ {!isMobile && (
+ <Tooltip
+ id="center-align-tooltip"
+ placement="top"
+ target={pillId}
+ boundariesElement="wv-content"
+ isOpen={isHovered || isSliding.current}
+ delay={{ show: 250, hide: 0 }}
+ >
+ {tooltipText}
+ </Tooltip>
+ )}
+ </>
+ );
+}
+
+LayerRowSlider.propTypes = {
+ sliderId: PropTypes.string,
+ min: PropTypes.number,
+ max: PropTypes.number,
+ value: PropTypes.number,
+ unitLabel: PropTypes.string,
+ tooltipText: PropTypes.string,
+ onChange: PropTypes.func,
+ isMobile: PropTypes.bool,
+ stopDndActivation: PropTypes.func,
+};
+
+export default LayerRowSlider;
diff --git a/web/js/components/sidebar/layer-row-slider.test.js b/web/js/components/sidebar/layer-row-slider.test.js
new file mode 100644
index 000000000..f7973d5c5
--- /dev/null
+++ b/web/js/components/sidebar/layer-row-slider.test.js
@@ -0,0 +1,132 @@
+/* eslint-disable react/prop-types */
+/* eslint-disable react/jsx-props-no-spreading */
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+jest.mock('reactstrap', () => ({
+ Tooltip: ({ isOpen, children }) => (isOpen ? <div data-testid="tooltip">{children}</div> : null),
+}));
+
+import LayerRowSlider from './layer-row-slider';
+
+const defaultProps = {
+ sliderId: 'layer-row-slider-active-test-layer',
+ min: 1,
+ max: 12,
+ value: 1,
+ unitLabel: 'DAY',
+ tooltipText: '1-day aggregation',
+ onChange: jest.fn(),
+ isMobile: false,
+ stopDndActivation: jest.fn(),
+};
+
+const renderSlider = (overrides = {}) => {
+ const props = { ...defaultProps, ...overrides };
+ return render(<LayerRowSlider {...props} />);
+};
+
+beforeEach(() => {
+ jest.clearAllMocks();
+ jest.useFakeTimers();
+});
+
+afterEach(() => {
+ jest.runOnlyPendingTimers();
+ jest.useRealTimers();
+});
+
+describe('LayerRowSlider', () => {
+ describe('layout', () => {
+ it('renders the range input', () => {
+ renderSlider();
+ expect(screen.getByRole('slider')).toBeInTheDocument();
+ });
+
+ it('renders a singular pill label when value is 1', () => {
+ renderSlider({ value: 1, unitLabel: 'DAY' });
+ expect(screen.getByText('1 DAY')).toBeInTheDocument();
+ });
+
+ it('renders a pluralized pill label when value is greater than 1', () => {
+ renderSlider({ value: 5, unitLabel: 'DAY' });
+ expect(screen.getByText('5 DAYS')).toBeInTheDocument();
+ });
+
+ it('does not render a tooltip on mobile', () => {
+ renderSlider({ isMobile: true });
+ fireEvent.mouseEnter(screen.getByText('1 DAY'));
+ expect(screen.queryByTestId('tooltip')).not.toBeInTheDocument();
+ });
+ });
+
+ describe('dnd activation guard', () => {
+ it('stops pointerdown from reaching the drag activator', () => {
+ const stopDndActivation = jest.fn();
+ renderSlider({ stopDndActivation });
+ fireEvent.pointerDown(screen.getByRole('slider').closest('.layer-row-slider'));
+ expect(stopDndActivation).toHaveBeenCalled();
+ });
+
+ it('stops mousedown from reaching the drag activator', () => {
+ const stopDndActivation = jest.fn();
+ renderSlider({ stopDndActivation });
+ fireEvent.mouseDown(screen.getByRole('slider').closest('.layer-row-slider'));
+ expect(stopDndActivation).toHaveBeenCalled();
+ });
+
+ it('stops keydown propagation so keyboard drag sensors do not activate', () => {
+ // React 18 delegates events to the render root itself, so a listener
+ // must sit above that root (e.g. document) to observe real bubbling.
+ const onDocumentKeyDown = jest.fn();
+ document.addEventListener('keydown', onDocumentKeyDown);
+ renderSlider();
+ fireEvent.keyDown(screen.getByRole('slider'), { key: 'Enter', bubbles: true });
+ document.removeEventListener('keydown', onDocumentKeyDown);
+ expect(onDocumentKeyDown).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('onChange', () => {
+ it('updates the pill label immediately on slide', () => {
+ renderSlider({ value: 1, unitLabel: 'DAY' });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '6' } });
+ expect(screen.getByText('6 DAYS')).toBeInTheDocument();
+ });
+
+ it('debounces the call to onChange', () => {
+ const onChange = jest.fn();
+ renderSlider({ onChange });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '3' } });
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '10' } });
+ expect(onChange).not.toHaveBeenCalled();
+ act(() => {
+ jest.runAllTimers();
+ });
+ expect(onChange).toHaveBeenCalledTimes(1);
+ expect(onChange).toHaveBeenCalledWith(10);
+ });
+ });
+
+ describe('tooltip', () => {
+ it('opens the tooltip on hover', () => {
+ renderSlider();
+ fireEvent.mouseEnter(screen.getByText('1 DAY'));
+ expect(screen.getByTestId('tooltip')).toHaveTextContent('1-day aggregation');
+ });
+
+ it('closes the tooltip on mouse leave', () => {
+ renderSlider();
+ const pill = screen.getByText('1 DAY');
+ fireEvent.mouseEnter(pill);
+ fireEvent.mouseLeave(pill);
+ expect(screen.queryByTestId('tooltip')).not.toBeInTheDocument();
+ });
+
+ it('stays open while actively sliding, even without hover', () => {
+ renderSlider();
+ fireEvent.change(screen.getByRole('slider'), { target: { value: '6' } });
+ expect(screen.getByTestId('tooltip')).toBeInTheDocument();
+ });
+ });
+});
diff --git a/web/js/components/util/use-debounced-slider-value.js b/web/js/components/util/use-debounced-slider-value.js
new file mode 100644
index 000000000..e6cf9dcfe
--- /dev/null
+++ b/web/js/components/util/use-debounced-slider-value.js
@@ -0,0 +1,38 @@
+import { useEffect, useRef, useState } from 'react';
+import { debounce } from 'lodash';
+
+/**
+ * Keeps a slider's displayed value fully controlled while debouncing the
+ * commit (e.g. a redux dispatch that triggers a layer rebuild). While the
+ * user is actively sliding, external prop updates are ignored so the thumb
+ * doesn't jump; once the debounced commit fires, external updates resume.
+ * @param {number} propValue | The externally-controlled value (e.g. from redux)
+ * @param {function} commit | Called with the final value after `delay` ms of inactivity
+ * @param {number} delay | Debounce delay in ms
+ * @returns {[number, function, object]} [value, onSlide, isSlidingRef]
+ */
+export default function useDebouncedSliderValue(propValue, commit, delay = 250) {
+ const [value, setValue] = useState(propValue);
+ const isSliding = useRef(false);
+ const commitRef = useRef(commit);
+ commitRef.current = commit;
+
+ const debouncedCommit = useRef(debounce((val) => {
+ isSliding.current = false;
+ commitRef.current(val);
+ }, delay)).current;
+
+ useEffect(() => {
+ if (!isSliding.current) setValue(propValue);
+ }, [propValue]);
+
+ useEffect(() => () => debouncedCommit.cancel(), [debouncedCommit]);
+
+ const onSlide = (val) => {
+ isSliding.current = true;
+ setValue(val);
+ debouncedCommit(val);
+ };
+
+ return [value, onSlide, isSliding];
+}
diff --git a/web/js/components/util/use-debounced-slider-value.test.js b/web/js/components/util/use-debounced-slider-value.test.js
new file mode 100644
index 000000000..bc9035587
--- /dev/null
+++ b/web/js/components/util/use-debounced-slider-value.test.js
@@ -0,0 +1,75 @@
+import { renderHook, act } from '@testing-library/react';
+import useDebouncedSliderValue from './use-debounced-slider-value';
+
+beforeEach(() => {
+ jest.useFakeTimers();
+});
+
+afterEach(() => {
+ jest.runOnlyPendingTimers();
+ jest.useRealTimers();
+});
+
+describe('useDebouncedSliderValue', () => {
+ it('initializes value from propValue', () => {
+ const { result } = renderHook(() => useDebouncedSliderValue(3, jest.fn()));
+ const [value] = result.current;
+ expect(value).toBe(3);
+ });
+
+ it('updates value immediately on slide, before the debounce fires', () => {
+ const { result } = renderHook(() => useDebouncedSliderValue(3, jest.fn()));
+ act(() => {
+ const [, onSlide] = result.current;
+ onSlide(7);
+ });
+ const [value] = result.current;
+ expect(value).toBe(7);
+ });
+
+ it('only calls commit once, after the debounce delay, for a rapid sequence of slides', () => {
+ const commit = jest.fn();
+ const { result } = renderHook(() => useDebouncedSliderValue(1, commit, 250));
+ act(() => {
+ const [, onSlide] = result.current;
+ onSlide(2);
+ onSlide(3);
+ onSlide(4);
+ });
+ expect(commit).not.toHaveBeenCalled();
+ act(() => {
+ jest.advanceTimersByTime(250);
+ });
+ expect(commit).toHaveBeenCalledTimes(1);
+ expect(commit).toHaveBeenCalledWith(4);
+ });
+
+ it('ignores external propValue updates while actively sliding', () => {
+ const { result, rerender } = renderHook(
+ ({ propValue }) => useDebouncedSliderValue(propValue, jest.fn()),
+ { initialProps: { propValue: 1 } },
+ );
+ act(() => {
+ const [, onSlide] = result.current;
+ onSlide(5);
+ });
+ rerender({ propValue: 9 });
+ const [value] = result.current;
+ expect(value).toBe(5);
+ });
+
+ it('resumes mirroring external propValue updates after the commit fires', () => {
+ const { result, rerender } = renderHook(
+ ({ propValue }) => useDebouncedSliderValue(propValue, jest.fn(), 250),
+ { initialProps: { propValue: 1 } },
+ );
+ act(() => {
+ const [, onSlide] = result.current;
+ onSlide(5);
+ jest.advanceTimersByTime(250);
+ });
+ rerender({ propValue: 9 });
+ const [value] = result.current;
+ expect(value).toBe(9);
+ });
+});
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index 87e658a19..70851a9cb 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -12,6 +12,7 @@ import {
import { faCircleDot, faCircle } from '@fortawesome/free-solid-svg-icons';
import googleTagManager from 'googleTagManager';
import PaletteLegend from '../../components/sidebar/paletteLegend';
+import LayerRowSlider from '../../components/sidebar/layer-row-slider';
import util from '../../util/util';
import { buildGranulesUrl, cmrFetch } from '../../util/cmr';
import {
@@ -25,6 +26,8 @@ import { requestPalette as requestPaletteAction } from '../../modules/palettes/a
import {
toggleVisibility as toggleVisibilityAction,
removeLayer as removeLayerAction,
+ updateDayCount as updateDayCountAction,
+ updateGranuleLayerOptions as updateGranuleLayerOptionsAction,
} from '../../modules/layers/actions';
import OrbitTrack from './orbit-track';
import Zot from './zot';
@@ -32,7 +35,9 @@ import { isVectorLayerClickable } from '../../modules/layers/util';
import { MODAL_PROPERTIES } from '../../modules/alerts/constants';
import {
getActiveLayers, makeGetDescription, getCollections,
+ getMaxDayRange, getLayerDayCount, getGranuleLayer,
} from '../../modules/layers/selectors';
+import { MAX_GRANULES, DEFAULT_DAY_COUNT } from '../../modules/layers/constants';
import { formatDailyDate, formatSubdailyDate } from '../../mapUI/components/kiosk/tile-measurement/utils/date-util';
import { coverageDateFormatter } from '../../modules/date/util';
import { SIDEBAR_LAYER_HOVER, MAP_RUNNING_DATA } from '../../util/constants';
@@ -107,6 +112,12 @@ function LayerRow (props) {
selectedDate,
describeDomainsUrl,
cmrBaseUrl,
+ maxDayRange,
+ dayCount,
+ granuleCount,
+ granuleDates,
+ updateDayCount,
+ updateGranuleLayerOptions,
} = props;
const encodedLayerId = util.encodeId(layer.id);
@@ -115,6 +126,8 @@ function LayerRow (props) {
const removeLayerBtnId = `close-${compareState}${encodedLayerId}`;
const removeLayerBtnTitle = 'Remove Layer';
const collectionIdentifierDescription = 'Dataset version and the source of data processing, Near Real-Time (NRT) or Standard (STD)';
+ const inRowSlider = !isEmbedModeActive && !isAnimating && !isChartingActive &&
+ !layer.shouldHide && isVisible && (!!maxDayRange || granuleCount != null);
const layerOptionsBtnId = `layer-options-btn-${encodedLayerId}`;
const layerOptionsBtnTitle = 'View Options';
@@ -533,6 +546,7 @@ function LayerRow (props) {
}
if (activeZot || zot) baseClasses += ' zotted';
if (layer.shouldHide) baseClasses += ' mini';
+ if (inRowSlider) baseClasses += ' has-row-slider';
return baseClasses;
};
@@ -558,7 +572,21 @@ function LayerRow (props) {
const visibilityIconClass = disabled ? 'ban' : visibilityIcon;
const collectionClass = collections?.type === 'NRT' ? 'collection-title badge rounded-pill bg-secondary' : 'collection-title badge rounded-pill text-dark bg-light';
+ const collectionIdentifierId = `collection-identifier-${compareState}-${encodedLayerId}`;
const vectorLayerMinHeight = isVectorLayer ? '60px' : '40px';
+ const rowMinHeight = layer.shouldHide
+ ? '22px'
+ : (isVectorLayer ? vectorLayerMinHeight : (inRowSlider ? '58px' : '40px'));
+
+ const dayRangeSliderValue = maxDayRange ? (dayCount || DEFAULT_DAY_COUNT) : granuleCount;
+ const sliderMax = maxDayRange || MAX_GRANULES;
+ const sliderUnitLabel = maxDayRange ? 'DAY' : 'GRANULE';
+ const sliderTooltipText = maxDayRange
+ ? `${dayRangeSliderValue}-day aggregation`
+ : `${dayRangeSliderValue} granules aggregated`;
+ const onSliderChange = maxDayRange
+ ? (val) => updateDayCount(layer.id, val)
+ : (val) => updateGranuleLayerOptions(granuleDates, layer, val);
const makeActiveForCharting = (layerArg) => {
if (layerArg !== activeChartingLayer) {
@@ -646,7 +674,7 @@ function LayerRow (props) {
<div
className="layer-info"
style={{
- minHeight: layer.shouldHide ? '22px' : vectorLayerMinHeight,
+ minHeight: rowMinHeight,
cursor: isDragDisabled ? undefined : (isDragging ? 'grabbing' : 'grab'),
}}
ref={setActivatorNodeRef}
@@ -664,9 +692,9 @@ function LayerRow (props) {
{collections && isVisible
? (
<h6>
- <span id="collection-identifier" className={collectionClass}>
+ <span id={collectionIdentifierId} className={collectionClass}>
{collections.version} {collections.type}
- <UncontrolledTooltip id="center-align-tooltip" placement="right" target="collection-identifier" boundariesElement="wv-content" delay={{ show: 250, hide: 0 }}>
+ <UncontrolledTooltip id="center-align-tooltip" placement="right" target={collectionIdentifierId} boundariesElement="wv-content" delay={{ show: 250, hide: 0 }}>
{collectionIdentifierDescription}
</UncontrolledTooltip>
</span>
@@ -675,6 +703,21 @@ function LayerRow (props) {
: ''}
</div>
)}
+ {inRowSlider && (
+ <div className="layer-row-slider-container">
+ <LayerRowSlider
+ sliderId={`layer-row-slider-${compareState}-${encodedLayerId}`}
+ min={1}
+ max={sliderMax}
+ value={dayRangeSliderValue}
+ unitLabel={sliderUnitLabel}
+ tooltipText={sliderTooltipText}
+ onChange={onSliderChange}
+ isMobile={isMobile}
+ stopDndActivation={stopDndActivation}
+ />
+ </div>
+ )}
{hasPalette && !layer.shouldHide ? getPaletteLegend() : ''}
</div>
@@ -787,6 +830,9 @@ const makeMapStateToProps = () => {
const { ddvZoomAlerts, ddvLocationAlerts } = state.alerts;
const describeDomainsUrl = config?.features?.describeDomains?.url || 'https://gibs.earthdata.nasa.gov';
const cmrBaseUrl = config?.features?.cmr?.url;
+ const maxDayRange = getMaxDayRange(layer);
+ const dayCount = maxDayRange ? getLayerDayCount(state, layer.id, compareState) : undefined;
+ const granuleState = layer.type === 'granule' ? getGranuleLayer(state, layer.id, compareState) : null;
return {
compare,
@@ -816,6 +862,10 @@ const makeMapStateToProps = () => {
renderedPalette: renderedPalettes[paletteName],
describeDomainsUrl,
cmrBaseUrl,
+ maxDayRange,
+ dayCount,
+ granuleCount: granuleState ? granuleState.count : null,
+ granuleDates: granuleState ? granuleState.dates : null,
};
};
};
@@ -839,6 +889,12 @@ const mapDispatchToProps = (dispatch) => ({
onRemoveClick: (id) => {
dispatch(removeLayerAction(id));
},
+ updateDayCount: (id, dayCount) => {
+ dispatch(updateDayCountAction(id, dayCount));
+ },
+ updateGranuleLayerOptions: (dates, def, count) => {
+ dispatch(updateGranuleLayerOptionsAction(dates, def, count));
+ },
onOptionsClick: (layer, title, zot) => {
const key = `LAYER_OPTIONS_MODAL-${layer.id}`;
googleTagManager.pushEvent({
@@ -966,4 +1022,10 @@ LayerRow.propTypes = {
selectedDate: PropTypes.instanceOf(Date),
describeDomainsUrl: PropTypes.string,
cmrBaseUrl: PropTypes.string,
+ maxDayRange: PropTypes.number,
+ dayCount: PropTypes.number,
+ granuleCount: PropTypes.number,
+ granuleDates: PropTypes.oneOfType([PropTypes.array, PropTypes.oneOf(['null'])]),
+ updateDayCount: PropTypes.func,
+ updateGranuleLayerOptions: PropTypes.func,
};
diff --git a/web/js/containers/sidebar/layer-row.test.js b/web/js/containers/sidebar/layer-row.test.js
index e608b3e23..a3c97159e 100644
--- a/web/js/containers/sidebar/layer-row.test.js
+++ b/web/js/containers/sidebar/layer-row.test.js
@@ -81,6 +81,11 @@ jest.mock('../../components/sidebar/paletteLegend', () => function MockPaletteLe
return React.createElement('div', { 'data-testid': `palette-legend-${layer.id}` });
});
+jest.mock('../../components/sidebar/layer-row-slider', () => function MockLayerRowSlider({ sliderId }) {
+ const React = require('react');
+ return React.createElement('div', { 'data-testid': 'layer-row-slider', id: sliderId });
+});
+
jest.mock('../../util/util', () => ({
encodeId: jest.fn((id) => id),
events: {
@@ -130,6 +135,8 @@ jest.mock('../../modules/palettes/actions', () => ({
jest.mock('../../modules/layers/actions', () => ({
toggleVisibility: jest.fn(() => ({ type: 'TOGGLE_VISIBILITY' })),
removeLayer: jest.fn(() => ({ type: 'REMOVE_LAYER' })),
+ updateDayCount: jest.fn(() => ({ type: 'UPDATE_DAY_COUNT' })),
+ updateGranuleLayerOptions: jest.fn(() => ({ type: 'UPDATE_GRANULE_LAYER_OPTIONS' })),
}));
jest.mock('./orbit-track', () => function MockOrbitTrack({ trackLayer }) {
@@ -158,6 +165,9 @@ jest.mock('../../modules/layers/selectors', () => ({
getActiveLayers: jest.fn(() => []),
makeGetDescription: jest.fn(() => jest.fn(() => 'mock-description-path')),
getCollections: jest.fn(() => null),
+ getMaxDayRange: jest.fn(() => 0),
+ getLayerDayCount: jest.fn(() => 1),
+ getGranuleLayer: jest.fn(() => null),
}));
jest.mock('../../mapUI/components/kiosk/tile-measurement/utils/date-util', () => ({
@@ -828,7 +838,7 @@ describe('Orbit tracks', () => {
describe('Collection display', () => {
it('renders collection identifier when collections truthy and isVisible', () => {
const { container } = renderComponent({ collections: { version: '6.0', type: 'NRT' }, isVisible: true });
- const span = container.querySelector('#collection-identifier');
+ const span = container.querySelector('.collection-title');
expect(span).toBeInTheDocument();
expect(span.textContent).toContain('6.0');
expect(span.textContent).toContain('NRT');
@@ -836,17 +846,17 @@ describe('Collection display', () => {
it('does not render collection when isVisible is false', () => {
const { container } = renderComponent({ collections: { version: '6.0', type: 'NRT' }, isVisible: false });
- expect(container.querySelector('#collection-identifier')).not.toBeInTheDocument();
+ expect(container.querySelector('.collection-title')).not.toBeInTheDocument();
});
it('uses bg-secondary badge for NRT type', () => {
const { container } = renderComponent({ collections: { version: '6.0', type: 'NRT' }, isVisible: true });
- expect(container.querySelector('#collection-identifier').className).toContain('bg-secondary');
+ expect(container.querySelector('.collection-title').className).toContain('bg-secondary');
});
it('uses bg-light badge for non-NRT type', () => {
const { container } = renderComponent({ collections: { version: '6.0', type: 'STD' }, isVisible: true });
- expect(container.querySelector('#collection-identifier').className).toContain('bg-light');
+ expect(container.querySelector('.collection-title').className).toContain('bg-light');
});
});
diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.js
index e7af9c08d..211151684 100644
--- a/web/js/map/layerbuilder.js
+++ b/web/js/map/layerbuilder.js
@@ -33,6 +33,7 @@ import {
mergeBreakpointLayerAttributes,
} from './util';
import { fetchSubdailyDateRanges, datesInDateRanges, prevDateInDateRange, nearestInterval } from '../modules/layers/util';
+import { getLayerDayCount } from '../modules/layers/selectors';
import { getSelectedDate } from '../modules/date/selectors';
import {
isActive as isPaletteActive,
@@ -208,7 +209,9 @@ export default function mapLayerBuilder(config, cache, store) {
if (isVectorStyleActive(def.id, activeGroupStr, state)) {
style = getVectorStyleKeys(def.id, undefined, state);
}
- return [layerId, projId, date, style, activeGroupStr].join(':');
+ const dayCount = getLayerDayCount(state, def.id, activeGroupStr);
+ const dayStr = dayCount > 1 ? `d${dayCount}` : '';
+ return [layerId, projId, date, style, activeGroupStr, dayStr].join(':');
};
/**
@@ -1411,6 +1414,10 @@ export default function mapLayerBuilder(config, cache, store) {
};
def = lodashCloneDeep(def);
lodashMerge(def, projections[proj.id]);
+ if (!def.dayRange) {
+ const dayCount = getLayerDayCount(state, id, options.group);
+ if (dayCount > 1) def.dayRange = dayCount - 1;
+ }
if (breakPointLayer) def = mergeBreakpointLayerAttributes(def, proj.id);
const isDataDownloadTabActive = activeTab === 'download';
const wrapDefined = wrapadjacentdays === true || wrapX;
diff --git a/web/js/mapUI/components/update-projection/updateProjection.js b/web/js/mapUI/components/update-projection/updateProjection.js
index ff84c7f9c..9d4500069 100644
--- a/web/js/mapUI/components/update-projection/updateProjection.js
+++ b/web/js/mapUI/components/update-projection/updateProjection.js
@@ -367,6 +367,8 @@ function UpdateProjection(props) {
};
return reloadLayers(granuleOptions);
}
+ case layerConstants.UPDATE_DAY_COUNT:
+ return reloadLayers();
case compareConstants.CHANGE_STATE:
if (compareMode === 'spy') {
return reloadLayers();
diff --git a/web/js/mapUI/mapUI.js b/web/js/mapUI/mapUI.js
index f7d3e6cc8..08edd836b 100644
--- a/web/js/mapUI/mapUI.js
+++ b/web/js/mapUI/mapUI.js
@@ -116,6 +116,7 @@ function MapUI(props) {
case LOCATION_POP_ACTION:
case layerConstants.UPDATE_GRANULE_LAYER_OPTIONS:
case layerConstants.RESET_GRANULE_LAYER_OPTIONS:
+ case layerConstants.UPDATE_DAY_COUNT:
case compareConstants.CHANGE_STATE:
case layerConstants.REORDER_LAYERS:
case layerConstants.REORDER_OVERLAY_GROUPS:
diff --git a/web/js/modules/layers/actions.js b/web/js/modules/layers/actions.js
index 0fcfcdc15..5d6e9f4d7 100644
--- a/web/js/modules/layers/actions.js
+++ b/web/js/modules/layers/actions.js
@@ -36,6 +36,7 @@ import {
UPDATE_DDV_LAYER,
ADD_GRANULE_DATE_RANGES,
ADD_TEMPO_DATE_RANGES,
+ UPDATE_DAY_COUNT,
} from './constants';
import { updateRecentLayers } from '../product-picker/util';
import { getOverlayGroups, getLayersFromGroups } from './util';
@@ -276,6 +277,18 @@ export function setOpacity(id, opacity) {
};
}
+export function updateDayCount(id, dayCount) {
+ return (dispatch, getState) => {
+ const { compare } = getState();
+ return dispatch({
+ type: UPDATE_DAY_COUNT,
+ id,
+ dayCount: Number(dayCount),
+ activeString: compare.activeString,
+ });
+ };
+}
+
export function hideLayers(layers) {
return (dispatch) => {
layers.forEach((obj) => {
diff --git a/web/js/modules/layers/constants.js b/web/js/modules/layers/constants.js
index 89201fd66..d08199adf 100644
--- a/web/js/modules/layers/constants.js
+++ b/web/js/modules/layers/constants.js
@@ -24,3 +24,7 @@ export const MAX_GRANULES = 30;
export const UPDATE_DDV_LAYER = 'LAYERS/UPDATE_DDV_LAYER';
export const ADD_GRANULE_DATE_RANGES = 'LAYERS/ADD_GRANULE_DATE_RANGES';
export const ADD_TEMPO_DATE_RANGES = 'LAYERS/ADD_TEMPO_DATE_RANGES';
+export const UPDATE_DAY_COUNT = 'LAYERS/UPDATE_DAY_COUNT';
+export const DEFAULT_DAY_COUNT = 1;
+export const MIN_DAY_COUNT = 1;
+export const MAX_DAY_COUNT = 12;
diff --git a/web/js/modules/layers/reducers.js b/web/js/modules/layers/reducers.js
index e5fe9b050..66788150c 100644
--- a/web/js/modules/layers/reducers.js
+++ b/web/js/modules/layers/reducers.js
@@ -25,6 +25,7 @@ import {
UPDATE_COLLECTION,
ADD_GRANULE_DATE_RANGES,
ADD_TEMPO_DATE_RANGES,
+ UPDATE_DAY_COUNT,
} from './constants';
import {
SET_CUSTOM as SET_CUSTOM_PALETTE,
@@ -215,6 +216,20 @@ export function layerReducer(state = initialState, action) {
},
});
+ case UPDATE_DAY_COUNT: {
+ const layerIndex = getLayerIndex();
+ if (layerIndex < 0) return state;
+ return update(state, {
+ [compareState]: {
+ layers: {
+ [layerIndex]: {
+ dayCount: { $set: action.dayCount },
+ },
+ },
+ },
+ });
+ }
+
case SET_THRESHOLD_RANGE_SQUASH_AND_NOCLIP:
case SET_DISABLED_CLASSIFICATION: {
const layerIndex = getLayerIndex();
diff --git a/web/js/modules/layers/reducers.test.js b/web/js/modules/layers/reducers.test.js
index 466b2f3e3..1295f1a01 100644
--- a/web/js/modules/layers/reducers.test.js
+++ b/web/js/modules/layers/reducers.test.js
@@ -25,6 +25,7 @@ import {
UPDATE_COLLECTION,
ADD_GRANULE_DATE_RANGES,
ADD_TEMPO_DATE_RANGES,
+ UPDATE_DAY_COUNT,
} from './constants';
import {
SET_VECTORSTYLE,
@@ -289,6 +290,26 @@ describe('layer Reducer tests', () => {
expect(getTestLayer(response.active.layers).opacity).toEqual(0.4);
});
+ test('UPDATE_DAY_COUNT action updates dayCount for given layer [layers-reducer-update-day-count]', () => {
+ const response = layerReducer(initialState, {
+ type: UPDATE_DAY_COUNT,
+ activeString: 'active',
+ dayCount: 5,
+ id: 'terra-cr',
+ });
+ expect(getTestLayer(response.active.layers).dayCount).toEqual(5);
+ });
+
+ test('UPDATE_DAY_COUNT returns unchanged state when layer id not found [layers-reducer-update-day-count-not-found]', () => {
+ const response = layerReducer(initialState, {
+ type: UPDATE_DAY_COUNT,
+ activeString: 'active',
+ dayCount: 5,
+ id: 'non-existent-layer',
+ });
+ expect(response).toEqual(initialState);
+ });
+
test('TOGGLE_LAYER_VISIBILITY returns unchanged state when layer id not found [layers-reducer-toggle-visibility-not-found]', () => {
const response = layerReducer(initialState, {
type: TOGGLE_LAYER_VISIBILITY,
diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.js
index a34ecdb88..cc4c80b25 100644
--- a/web/js/modules/layers/selectors.js
+++ b/web/js/modules/layers/selectors.js
@@ -13,6 +13,7 @@ import update from 'immutability-helper';
import util from '../../util/util';
import { getLayerNoticesForLayer } from '../notifications/util';
import { getSelectedDate } from '../date/selectors';
+import { DEFAULT_DAY_COUNT, MIN_DAY_COUNT, MAX_DAY_COUNT } from './constants';
const getConfigParameters = ({ config }) => (config ? config.parameters : {});
const getProjState = ({ proj }) => proj;
@@ -49,6 +50,7 @@ export function addLayer(
def.noclip = spec.noclip || undefined;
def.disabled = spec.disabled || undefined;
def.count = spec.count || def.count || undefined;
+ def.dayCount = spec.dayCount || def.dayCount || undefined;
if (Array.isArray(spec.bandCombo)) {
def.bandCombo = {
@@ -210,6 +212,21 @@ export const getGranulePlatform = (state, activeString) => {
return granulePlatform;
};
+export const getMaxDayRange = (def) => {
+ const max = Number(def && def.maxDayRange);
+ return Number.isFinite(max) && max > 1 ? Math.min(max, MAX_DAY_COUNT) : 0;
+};
+
+export const getLayerDayCount = (state, id, activeString) => {
+ const { compare, layers } = state;
+ const side = activeString || (compare && compare.activeString) || 'active';
+ const sideLayers = (layers[side] && layers[side].layers) || [];
+ const def = lodashFind(sideLayers, { id });
+ const max = getMaxDayRange(def);
+ if (!max) return DEFAULT_DAY_COUNT;
+ return util.clamp(def.dayCount || DEFAULT_DAY_COUNT, MIN_DAY_COUNT, max);
+};
+
export const getActiveGranuleFootPrints = (state) => {
const { layers, compare: { activeString } } = state;
const granuleLayers = getActiveGranuleLayers(state);
diff --git a/web/js/modules/layers/selectors.test.js b/web/js/modules/layers/selectors.test.js
index f22ac0dd7..b0304327f 100644
--- a/web/js/modules/layers/selectors.test.js
+++ b/web/js/modules/layers/selectors.test.js
@@ -26,6 +26,8 @@ import {
activateLayersForEventCategory,
getZotsForActiveLayers,
getMaxZoomLevelLayerCollection,
+ getMaxDayRange,
+ getLayerDayCount,
} from './selectors';
const config = fixtures.config();
@@ -1411,3 +1413,62 @@ test('returns fallback zoom when all layers are non-qualifying', () => {
test('returns fallback zoom of 0 when passed 0 and no qualifying layers', () => {
expect(getMaxZoomLevelLayerCollection([], 0, 'geographic', {})).toBe(0);
});
+
+describe('getMaxDayRange', () => {
+ test('returns 0 when layer has no maxDayRange', () => {
+ expect(getMaxDayRange({ id: 'foo' })).toBe(0);
+ });
+
+ test('returns 0 when maxDayRange is 1 (no aggregation possible)', () => {
+ expect(getMaxDayRange({ id: 'foo', maxDayRange: 1 })).toBe(0);
+ });
+
+ test('returns the configured maxDayRange', () => {
+ expect(getMaxDayRange({ id: 'foo', maxDayRange: 12 })).toBe(12);
+ });
+
+ test('clamps to MAX_DAY_COUNT', () => {
+ expect(getMaxDayRange({ id: 'foo', maxDayRange: 999 })).toBe(12);
+ });
+});
+
+describe('getLayerDayCount', () => {
+ function getDayCountState(layer, activeString = 'active') {
+ return {
+ layers: {
+ [activeString]: { layers: [layer] },
+ },
+ compare: { activeString: 'active' },
+ };
+ }
+
+ test('defaults to 1 when layer has no maxDayRange', () => {
+ const state = getDayCountState({ id: 'foo', dayCount: 5 });
+ expect(getLayerDayCount(state, 'foo')).toBe(1);
+ });
+
+ test('reads dayCount when within maxDayRange', () => {
+ const state = getDayCountState({ id: 'foo', maxDayRange: 12, dayCount: 5 });
+ expect(getLayerDayCount(state, 'foo')).toBe(5);
+ });
+
+ test('clamps dayCount above maxDayRange', () => {
+ const state = getDayCountState({ id: 'foo', maxDayRange: 12, dayCount: 99 });
+ expect(getLayerDayCount(state, 'foo')).toBe(12);
+ });
+
+ test('defaults to 1 when dayCount is unset', () => {
+ const state = getDayCountState({ id: 'foo', maxDayRange: 12 });
+ expect(getLayerDayCount(state, 'foo')).toBe(1);
+ });
+
+ test('reads the requested side in compare mode', () => {
+ const state = getDayCountState({ id: 'foo', maxDayRange: 12, dayCount: 7 }, 'activeB');
+ expect(getLayerDayCount(state, 'foo', 'activeB')).toBe(7);
+ });
+
+ test('tolerates a side with no layers array', () => {
+ const state = { layers: { active: {} }, compare: { activeString: 'active' } };
+ expect(getLayerDayCount(state, 'foo')).toBe(1);
+ });
+});
diff --git a/web/js/modules/layers/util.js b/web/js/modules/layers/util.js
index bb7b059c2..8318a4b28 100644
--- a/web/js/modules/layers/util.js
+++ b/web/js/modules/layers/util.js
@@ -18,11 +18,13 @@ import {
getFutureLayerEndDate,
getActiveLayersMap,
getGranuleLayer,
+ getMaxDayRange,
} from './selectors';
import { getPaletteAttributeArray } from '../palettes/util';
import { getVectorStyleAttributeArray } from '../vector-styles/util';
import util from '../../util/util';
import { parseDate } from '../date/util';
+import { DEFAULT_DAY_COUNT, MIN_DAY_COUNT, MAX_DAY_COUNT } from './constants';
/**
* Given a layer definition, returns formatted string
@@ -904,6 +906,12 @@ export function serializeLayers(layers, state, groupName) {
value: bandComboString,
});
}
+ if (def.dayCount > DEFAULT_DAY_COUNT && getMaxDayRange(def)) {
+ item.attributes.push({
+ id: 'days',
+ value: def.dayCount,
+ });
+ }
if (def.palette &&
(def.custom || def.min || def.max || def.squash || def.noclip || def.disabled ||
(palettes[def.id] && palettes[def.id].maps && palettes[def.id].maps.length > 1))) {
@@ -974,6 +982,7 @@ const getLayerSpec = (attributes) => {
let custom;
let disabled;
let count;
+ let dayCount;
let bandCombo;
lodashEach(attributes, (attr) => {
@@ -1080,12 +1089,20 @@ const getLayerSpec = (attributes) => {
if (attr.id === 'count') {
count = Number(attr.value);
}
+ // multi-day aggregation count (defaults to 1 if no param)
+ if (attr.id === 'days') {
+ const parsed = parseInt(attr.value, 10);
+ if (!lodashIsNaN(parsed)) {
+ dayCount = util.clamp(parsed, MIN_DAY_COUNT, MAX_DAY_COUNT);
+ }
+ }
});
return {
hidden,
opacity,
count,
+ dayCount,
bandCombo,
// only include palette attributes if Array.length condition
diff --git a/web/js/modules/layers/util.test.js b/web/js/modules/layers/util.test.js
index a1bf94f3a..62fbb89d4 100644
--- a/web/js/modules/layers/util.test.js
+++ b/web/js/modules/layers/util.test.js
@@ -113,6 +113,52 @@ test('serialize layers and palettes [layers-serialize]', () => {
expect(layerStr).toBe('terra-aod(hidden,opacity=0.54)');
});
+describe('multi-day aggregation permalink', () => {
+ const paletteState = {
+ palettes: {
+ active: {},
+ rendered: config.palettes.rendered,
+ custom: config.palettes.custom,
+ },
+ config,
+ };
+ const state = assign({}, paletteState, { layers: initialState });
+
+ test('serializes days attribute when dayCount is set above default', () => {
+ const layer = {
+ id: 'terra-aod', visible: true, opacity: 1, maxDayRange: 12, dayCount: 10,
+ };
+ const layerStr = serializeLayers([layer], state, 'active')[0];
+ expect(layerStr).toBe('terra-aod(days=10)');
+ });
+
+ test('omits days attribute at the default value of 1', () => {
+ const layer = {
+ id: 'terra-aod', visible: true, opacity: 1, maxDayRange: 12, dayCount: 1,
+ };
+ const layerStr = serializeLayers([layer], state, 'active')[0];
+ expect(layerStr).toBe('terra-aod');
+ });
+
+ test('omits days attribute when layer has no maxDayRange', () => {
+ const layer = {
+ id: 'terra-aod', visible: true, opacity: 1, dayCount: 10,
+ };
+ const layerStr = serializeLayers([layer], state, 'active')[0];
+ expect(layerStr).toBe('terra-aod');
+ });
+
+ test('parses days attribute from permalink string', () => {
+ const layers = layersParse12('terra-aod(days=10)', config);
+ expect(layers[0].dayCount).toBe(10);
+ });
+
+ test('clamps a hostile days value from permalink string', () => {
+ const layers = layersParse12('terra-aod(days=99)', config);
+ expect(layers[0].dayCount).toBe(12);
+ });
+});
+
// Permalink 1.0
describe('permalink 1.0', () => {
beforeEach(() => {
diff --git a/web/scss/components/range.scss b/web/scss/components/range.scss
index f45bc26cd..9ee9762a8 100644
--- a/web/scss/components/range.scss
+++ b/web/scss/components/range.scss
@@ -58,6 +58,34 @@
}
}
+ .form-range.form-range-compact {
+ &::-webkit-slider-thumb {
+ margin-top: -8px;
+ width: 18px;
+ height: 18px;
+ background-color: #333;
+ border-color: #333;
+ }
+
+ &::-moz-range-thumb {
+ width: 18px;
+ height: 18px;
+ background-color: #333;
+ border-color: #333;
+ }
+
+ &::-ms-thumb {
+ width: 18px;
+ height: 18px;
+ background-color: #333;
+ border-color: #333;
+ }
+
+ &::-webkit-slider-runnable-track {
+ height: 3px;
+ }
+ }
+
.form-range.range-mobile {
&::-webkit-slider-runnable-track {
height: 10px;
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index 47b3e20c6..5435ca71f 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -1079,6 +1079,15 @@
margin-right: 4px;
}
+.day-range-pill {
+ margin-left: 6px;
+ font-size: 12px;
+ padding: 0.35em 0.75em;
+ letter-spacing: 0.3px;
+ white-space: nowrap;
+ cursor: pointer;
+}
+
.instrument-collection {
margin-top: 3px;
display: flex;
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index b3eaaf8e9..3949c84bc 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -252,6 +252,14 @@ li.item.productsitem.inmotion,
border: 1px solid #333;
overflow: hidden;
+ &.has-row-slider {
+ min-height: 58px;
+
+ .layer-main {
+ min-height: 58px;
+ }
+ }
+
&.mini {
min-height: 22px;
@@ -265,6 +273,22 @@ li.item.productsitem.inmotion,
}
}
+.layer-row-slider-container {
+ display: flex;
+ align-items: center;
+ padding: 2px 6px 4px 4px;
+
+ .layer-row-slider {
+ flex: 1;
+ min-width: 0;
+
+ input {
+ width: 100%;
+ margin: 0;
+ }
+ }
+}
+
.sidebar-panel li.item.productsitem:hover {
border-color: #fff;
}
diff --git a/web/scss/features/sidebar.scss b/web/scss/features/sidebar.scss
index 3a65cb445..f9d60f935 100644
--- a/web/scss/features/sidebar.scss
+++ b/web/scss/features/sidebar.scss
@@ -1232,7 +1232,8 @@ p.recharts-tooltip-label {
}
.wv-label-opacity,
- .wv-label-granule.count {
+ .wv-label-day-range,
+ .wv-label-granule-count {
text-align: right;
}