Interactive interface for browsing global, full-resolution satellite imagery
WV-2403: Show All Event Tracks Feature (#4008)
Ryan Weiler45ec5e9b16ec
diff --git a/config/default/common/config/wv.json/naturalEvents.json b/config/default/common/config/wv.json/naturalEvents.jsonindex 1aba8cce8..b06ee9b2b 100644--- a/config/default/common/config/wv.json/naturalEvents.json+++ b/config/default/common/config/wv.json/naturalEvents.json@@ -1120,6 +1120,7 @@]]}- }+ },+ "defaultLayer": "BlueMarble_NextGeneration"}}\ No newline at end of filediff --git a/e2e/features/layers/layers-sidebar-test.js b/e2e/features/layers/layers-sidebar-test.jsindex 7b185accf..3145f2d2d 100644--- a/e2e/features/layers/layers-sidebar-test.js+++ b/e2e/features/layers/layers-sidebar-test.js@@ -207,6 +207,7 @@ module.exports = {const actions = this.actions({ async: true });const layerGroupHeader = c.findElement(aodGroupHeader);const firesHeader = c.findElement(firesGroupHeader);+ c.pause(500);return actions.click(layerGroupHeader).pause(300)diff --git a/web/js/components/sidebar/event.js b/web/js/components/sidebar/event.jsindex 8bfe17dda..a86829461 100644--- a/web/js/components/sidebar/event.js+++ b/web/js/components/sidebar/event.js@@ -11,12 +11,18 @@ import MonospaceDate from '../util/monospace-date';function Event (props) {const {+ defaultEventLayer,deselectEvent,event,+ eventLayers,isSelected,+ layers,+ removeGroup,selectedDate,selectEvent,sources,+ toggleGroupVisibility,+ toggleVisibility,} = props;const dateString = formatDisplayDate(event.geometry[0].date);const itemClass = isSelected@@ -39,9 +45,19 @@ function Event (props) {*/function onEventSelect(date) {if (isSelected && (!date || date === selectedDate)) {+ const layersToHide = [];+ layers.forEach((layer) => {+ if (layer.group === 'overlays' && layer.layergroup !== 'Reference') {+ layersToHide.push(layer.id);+ }+ });+ toggleGroupVisibility(layersToHide, false);+ removeGroup(eventLayers);+ toggleVisibility(defaultEventLayer, true);deselectEvent();} else {const selectedEventDate = date || getDefaultEventDate(event);+ toggleVisibility(defaultEventLayer, false);selectEvent(event.id, selectedEventDate);googleTagManager.pushEvent({event: 'natural_event_selected',@@ -178,12 +194,18 @@ function Event (props) {}Event.propTypes = {+ defaultEventLayer: PropTypes.string,deselectEvent: PropTypes.func,event: PropTypes.object,+ eventLayers: PropTypes.array,isSelected: PropTypes.bool,+ layers: PropTypes.array,+ removeGroup: PropTypes.func,selectedDate: PropTypes.string,selectEvent: PropTypes.func,sources: PropTypes.array,+ toggleGroupVisibility: PropTypes.func,+ toggleVisibility: PropTypes.func,};export default Event;diff --git a/web/js/components/sidebar/events-filter.js b/web/js/components/sidebar/events-filter.jsindex c0921be8a..58d1cea99 100644--- a/web/js/components/sidebar/events-filter.js+++ b/web/js/components/sidebar/events-filter.js@@ -24,6 +24,7 @@ function EventFilterModalBody (props) {setFilter,closeModal,showAll,+ showAllTracks,parentId,isPolarProj,isMobile,@@ -32,6 +33,7 @@ function EventFilterModalBody (props) {const [allNone, setAllNone] = useState(!!selectedCategories.length);const [categories, setCategories] = useState(selectedCategories);const [listAll, setListAll] = useState(showAll);+ const [showAllTracksData, toggleShowAllTracks] = useState(showAllTracks);const parsedStartDate = selectedStartDate && new Date(moment(selectedStartDate).valueOf());const parsedEndDate = selectedEndDate && new Date(moment(selectedEndDate).valueOf());@@ -53,7 +55,7 @@ function EventFilterModalBody (props) {const start = startDate && util.toISOStringDate(startDate);const end = endDate && util.toISOStringDate(endDate);closeModal();- setFilter(categories, start, end, listAll);+ setFilter(categories, start, end, listAll, showAllTracksData);if (showAll !== listAll) {const event = listAll ? 'natural_events_show_all' : 'natural_events_current_view_only';googleTagManager.pushEvent({ event });@@ -148,6 +150,21 @@ function EventFilterModalBody (props) {</>)}+ <Checkbox+ id="show-all-tracks-filter"+ label="Show tracks for all events"+ onCheck={() => toggleShowAllTracks(!showAllTracksData)}+ checked={showAllTracksData}+ />+ <FontAwesomeIcon id="bbox-show-all-tracks" icon="info-circle" />+ <UncontrolledTooltip+ placement="right"+ target="bbox-show-all-tracks"+ >+ If checked, shows tracks for all of the events listed in the sidebar. If unchecked, tracks will only+ show for a selected event.+ </UncontrolledTooltip>+<Portal node={document.querySelector(`#${parentId} .modal-footer`)}><Buttonid="filter-apply-btn"@@ -180,6 +197,7 @@ EventFilterModalBody.propTypes = {selectedEndDate: PropTypes.string,setFilter: PropTypes.func,showAll: PropTypes.bool,+ showAllTracks: PropTypes.bool,isMobile: PropTypes.bool,};@@ -188,7 +206,7 @@ const mapStateToProps = (state) => {events, proj, config, screenSize,} = state;const {- selectedCategories, selectedDates, showAll,+ selectedCategories, selectedDates, showAll, showAllTracks,} = events;const isPolarProj = proj.selected.crs === CRS.ANTARCTIC || proj.selected.crs === CRS.ARCTIC;@@ -200,19 +218,21 @@ const mapStateToProps = (state) => {selectedStartDate: selectedDates.start,selectedEndDate: selectedDates.end,showAll,+ showAllTracks,isMobile: screenSize.isMobileDevice,screenHeight: screenSize.screenHeight,};};const mapDispatchToProps = (dispatch) => ({- setFilter: (categories, startDate, endDate, showAll) => {+ setFilter: (categories, startDate, endDate, showAll, showAllTracks) => {dispatch(setEventsFilterAction(categories,startDate,endDate,showAll,+ showAllTracks,),);},diff --git a/web/js/containers/sidebar/events.js b/web/js/containers/sidebar/events.jsindex 73aa02128..83997ebc5 100644--- a/web/js/containers/sidebar/events.js+++ b/web/js/containers/sidebar/events.js@@ -1,4 +1,3 @@-import React from 'react';import PropTypes from 'prop-types';import { connect } from 'react-redux';@@ -18,14 +17,22 @@ import {import { collapseSidebar } from '../../modules/sidebar/actions';import { getSelectedDate } from '../../modules/date/selectors';import { toggleCustomContent } from '../../modules/modal/actions';+import {+ addLayer as addLayerAction,+ removeGroup as removeGroupAction,+ toggleVisibility as toggleVisibilityAction,+ toggleGroupVisibility as toggleGroupVisibilityAction,+} from '../../modules/layers/actions';import util from '../../util/util';import { formatDisplayDate } from '../../modules/date/util';function Events(props) {const {+ defaultEventLayer,eventsData,sources,isLoading,+ layers,selectEvent,selected,openFilterModal,@@ -40,6 +47,10 @@ function Events(props) {selectedStartDate,selectedEndDate,selectedCategories,+ removeGroup,+ eventLayers,+ toggleVisibility,+ toggleGroupVisibility,} = props;const filterControlHeight = 115;@@ -55,7 +66,6 @@ function Events(props) {? 'There has been an ERROR retrieving events from the EONET events API. Please try again later.': '';-const renderFilterControls = () => (<div className="filter-controls"><div className="filter-dates-icons">@@ -98,9 +108,15 @@ function Events(props) {event={event}selectEvent={(id, date) => selectEvent(id, date, isMobile)}deselectEvent={deselectEvent}+ removeGroup={removeGroup}+ eventLayers={eventLayers}+ toggleVisibility={toggleVisibility}+ toggleGroupVisibility={toggleGroupVisibility}isSelected={selected.id === event.id}selectedDate={selectedDate}sources={sources}+ defaultEventLayer={defaultEventLayer}+ layers={layers}/>))}</ul>@@ -150,14 +166,28 @@ const mapDispatchToProps = (dispatch) => ({timeout: 150,}));},+ addLayer: (id) => {+ dispatch(addLayerAction(id));+ },+ toggleVisibility: (layerIds, visible) => {+ dispatch(toggleVisibilityAction(layerIds, visible));+ },+ removeGroup: (ids) => {+ dispatch(removeGroupAction(ids));+ },+ toggleGroupVisibility: (layerIds, visible) => {+ dispatch(toggleGroupVisibilityAction(layerIds, visible));+ },});const mapStateToProps = (state) => {const {animation,+ config,embed,events,screenSize,+ layers,} = state;const {@@ -166,10 +196,13 @@ const mapStateToProps = (state) => {const { isEmbedModeActive } = embed;return {+ defaultEventLayer: config.naturalEvents.defaultLayer,+ eventLayers: layers.eventLayers,isPlaying: animation.isPlaying,isMobile: screenSize.isMobileDevice,isEmbedModeActive,isAnimatingToEvent: events.isAnimatingToEvent,+ layers: layers.active.layers,showAll,showDates: !!(selectedDates.start && selectedDates.end),selected,@@ -185,14 +218,18 @@ export default connect()(Events);Events.propTypes = {+ defaultEventLayer: PropTypes.string,deselectEvent: PropTypes.func,+ eventLayers: PropTypes.array,eventsData: PropTypes.array,hasRequestError: PropTypes.bool,height: PropTypes.number,isLoading: PropTypes.bool,isMobile: PropTypes.bool,isEmbedModeActive: PropTypes.bool,+ layers: PropTypes.array,openFilterModal: PropTypes.func,+ removeGroup: PropTypes.func,selected: PropTypes.object,selectedDate: PropTypes.string,showDates: PropTypes.bool,@@ -202,4 +239,6 @@ Events.propTypes = {selectEvent: PropTypes.func,showAlert: PropTypes.bool,sources: PropTypes.array,+ toggleGroupVisibility: PropTypes.func,+ toggleVisibility: PropTypes.func,};diff --git a/web/js/location.js b/web/js/location.jsindex c2a5aaeb9..9d40ebc0e 100644--- a/web/js/location.js+++ b/web/js/location.js@@ -326,6 +326,19 @@ const getParameters = function(config, parameters) {setAsEmptyItem: true,},},+ efa: {+ stateKey: 'events.showAllTracks',+ initialState: false,+ type: 'bool',+ options: {+ serializeNeedsGlobalState: true,+ serialize: (showAllTracks, state) => {+ const eventsActive = get(state, 'events.active');+ return eventsActive ? showAllTracks : undefined;+ },+ setAsEmptyItem: true,+ },+ },efd: {stateKey: 'events.selectedDates',type: 'object',diff --git a/web/js/map/natural-events/cluster.js b/web/js/map/natural-events/cluster.jsindex 45a45d232..7bc4af0fe 100644--- a/web/js/map/natural-events/cluster.js+++ b/web/js/map/natural-events/cluster.js@@ -9,8 +9,8 @@ import { crossesDateLine, getOverDateLineCoordinates } from '../util';** @return {void}*/-export const naturalEventsClusterCreateObject = () => new Supercluster({- radius: 60, // pixel radius where points are clustered+export const naturalEventsClusterCreateObject = (proj) => new Supercluster({+ radius: proj.selected.id === 'geographic' ? 0 : 60, // pixel radius where points are clusteredmaxZoom: 12,map: (props) => ({ startDate: props.date, endDate: props.date }),reduce: (accumulated, properties) => {@@ -31,12 +31,9 @@ export const naturalEventsClusterCreateObject = () => new Supercluster({}},setPolar: () => ({ radius: 30, maxZoom: 7 }),- setGeo: () => ({ radius: 60, maxZoom: 12 }),+ setGeo: () => ({ radius: 0, maxZoom: 12 }),});-const firstClusterObj = naturalEventsClusterCreateObject(); // Cluster before selected event-const secondClusterObj = naturalEventsClusterCreateObject(); // Cluster after selected event-/*** Create a geoJSON point out of a point*@@ -104,6 +101,7 @@ export const getClusters = ({ geometry, id }, proj, selectedDate, map) => {// replace coordinatescoordinates = getOverDateLineCoordinates(coordinates);}+// Cluster in three groupsif (isSelected) {selectedPoint = clusterPointToGeoJSON(@@ -124,6 +122,9 @@ export const getClusters = ({ geometry, id }, proj, selectedDate, map) => {}});+ const firstClusterObj = naturalEventsClusterCreateObject(proj); // Cluster before selected event+ const secondClusterObj = naturalEventsClusterCreateObject(proj); // Cluster after selected event+// set radius and maxZoom of superCluster object for polar vs geographic projectionsif (proj.selected.id !== 'geographic') {firstClusterObj.options.setPolar();diff --git a/web/js/map/natural-events/event-track.js b/web/js/map/natural-events/event-track.jsindex 6b3c470d2..bc78f20fd 100644--- a/web/js/map/natural-events/event-track.js+++ b/web/js/map/natural-events/event-track.js@@ -25,14 +25,17 @@ class EventTrack extends React.Component {this.state = {trackDetails: {},+ allTrackDetails: {},};+ // debounce delays the function call by a set amount of time. in this case 50 millisecondsthis.debouncedTrackUpdate = lodashDebounce(this.updateCurrentTrack, 50);this.debouncedOnPropertyChange = lodashDebounce(this.onPropertyChange.bind(this),100,{ leading: true, trailing: true },);+ this.debouncedUpdateAllTracks = lodashDebounce(this.updateAllTracks, 50);}componentDidMount() {@@ -41,7 +44,7 @@ class EventTrack extends React.Component {componentDidUpdate(prevProps) {const {- isPlaying, map, extent, selectedDate, isAnimatingToEvent, eventsData, selectedEvent,+ isPlaying, map, extent, selectedDate, isAnimatingToEvent, eventsData, selectedEvent, showAllTracks,} = this.props;const selectedDateChange = (selectedDate && selectedDate.valueOf())!== (prevProps.selectedDate && prevProps.selectedDate.valueOf());@@ -50,6 +53,7 @@ class EventTrack extends React.Component {const eventsLoaded = eventsData && eventsData.length && (eventsData !== prevProps.eventsData);const prevMap = prevProps.map;const prevExtent = prevProps.extent;+ const prevShowAllTracks = prevProps.showAllTracks;const extentChange = prevExtent && (extent[0] !== prevExtent[0] || extent[1] !== prevExtent[1]);const { trackDetails } = this.state;@@ -58,32 +62,54 @@ class EventTrack extends React.Component {this.update(null);this.removeTrack(prevMap);removePointOverlays(prevMap, trackDetails.pointsAndArrows);+ if (showAllTracks) {+ this.removeAllTracks(prevMap);+ }}this.initialize();}- if (!isPlaying && (selectedDateChange || finishedAnimating || eventsLoaded || extentChange)) {+ // remove all tracks when deselecting option+ if (!showAllTracks && prevShowAllTracks !== showAllTracks) {+ this.removeAllTracks(map);+ }++ // show all tracks when selecting as option+ if (showAllTracks && !isPlaying && (prevShowAllTracks !== showAllTracks || selectedDateChange || finishedAnimating || eventsLoaded || extentChange)) {+ this.debouncedUpdateAllTracks();+ }++ // show only selected track if show all tracks is not selected+ if (!isPlaying && !showAllTracks && (selectedDateChange || finishedAnimating || eventsLoaded || extentChange)) {this.debouncedTrackUpdate();}- if (eventDeselect) {+ // only remove selected track when event is deselected+ if (eventDeselect && !showAllTracks) {this.removeTrack(map);}}componentWillUnmount() {- const { map } = this.props;+ const { map, showAllTracks } = this.props;this.update(null);map.getView().un('propertychange', this.debouncedOnPropertyChange);+ if (showAllTracks) {+ this.removeAllTracks(map);+ }}initialize() {- const { map } = this.props;+ const { map, showAllTracks } = this.props;if (!map) return;map.getView().on('propertychange', this.debouncedOnPropertyChange);map.once('postrender', () => { this.debouncedTrackUpdate(); });+ if (showAllTracks) {+ map.once('postrender', () => { this.debouncedUpdateAllTracks(); });+ }}+ // $$$ This function merely gets the selected event data from the events data and calls the update() function with that data, will likely not need it $$$updateCurrentTrack() {const { selectedEvent, eventsData } = this.props;const { id, date } = selectedEvent;@@ -94,8 +120,13 @@ class EventTrack extends React.Component {}onPropertyChange = (e) => {- const { map } = this.props;- const { trackDetails } = this.state;+ const { map, showAllTracks } = this.props;+ const { trackDetails, allTrackDetails } = this.state;++ if (showAllTracks && !allTrackDetails.length) return;+ if (showAllTracks && (e.key === 'resolution' || e.key === 'rotation')) {+ this.removeAllTracks(map);+ }if (!trackDetails.id) return;if (e.key === 'resolution' || e.key === 'rotation') {const newTrackDetails = trackDetails.id ? this.removeTrack(map) : {};@@ -104,8 +135,11 @@ class EventTrack extends React.Component {}addTrack = (map, { track, pointsAndArrows }) => {- map.addOverlay(track);- addPointOverlays(map, pointsAndArrows);+ const { isAnimatingToEvent } = this.props;+ if (!isAnimatingToEvent) {+ map.addOverlay(track);+ addPointOverlays(map, pointsAndArrows);+ }}removeTrack = function(map) {@@ -116,6 +150,56 @@ class EventTrack extends React.Component {return {};};+ removeAllTracks = (map) => {+ const { allTrackDetails } = this.state;+ allTrackDetails.forEach((trackDetail) => {+ const { pointsAndArrows } = trackDetail.newTrackDetails;+ const { track } = trackDetail.newTrackDetails;+ map.removeOverlay(track);+ removePointOverlays(map, pointsAndArrows);+ });+ }++ updateAllTracks = () => {+ const {+ proj, map, eventsData, selectEvent, showAllTracks,+ } = this.props;+ const { allTrackDetails, trackDetails } = this.state;+ let newTrackDetails;+ const allTracks = [];++ const createAndAddTrack = (singleEvent, eventID, eventDate) => {+ const {+ track,+ pointsAndArrows,+ } = getTracksAndPoints(singleEvent, proj, map, eventDate, selectEvent, showAllTracks);++ newTrackDetails = {+ id: eventID,+ selectedDate: eventDate,+ track,+ pointsAndArrows,+ hidden: false,+ };+ allTracks.push({ newTrackDetails });+ this.addTrack(map, newTrackDetails);+ };++ if (allTrackDetails.length) {+ this.removeAllTracks(map);+ }++ eventsData.forEach((event) => {+ const eventID = event.id;+ const eventDate = event.geometry[0].date.slice(0, 10);+ if (event.geometry.length > 1 && eventID !== trackDetails.id) {+ createAndAddTrack(event, eventID, eventDate);+ }+ });++ this.setState({ allTrackDetails: allTracks });+ }+/*** Update track*@@ -220,10 +304,10 @@ const updateSelection = function(newDate) {* @param {Function} callback* @return {Object} Object Containing track info and elements*/-const getTracksAndPoints = function(eventObj, proj, map, selectedDate, callback) {+const getTracksAndPoints = function(eventObj, proj, map, selectedDate, callback, showAllTracks) {const pointsAndArrows = [];const trackSegments = [];- const { clusters, firstClusterObj, secondClusterObj } = getClusters(eventObj, proj, selectedDate, map);+ const { clusters, firstClusterObj, secondClusterObj } = getClusters(eventObj, proj, selectedDate, map, showAllTracks);clusters.forEach((clusterPoint, index) => {const date = clusterPoint.properties.date || clusterPoint.properties.startDate;@@ -279,6 +363,8 @@ const mapStateToProps = (state) => {proj,selectedDate: date.selected,selectedEvent: events.selected,+ showAllTracks: events.showAllTracks,+ isActive: events.active,};};@@ -298,6 +384,7 @@ EventTrack.propTypes = {selectEvent: PropTypes.func,selectedEvent: PropTypes.object,selectedDate: PropTypes.object,+ showAllTracks: PropTypes.bool,};export default connect(diff --git a/web/js/map/natural-events/natural-events.js b/web/js/map/natural-events/natural-events.jsindex f4c3402ea..31ad337b0 100644--- a/web/js/map/natural-events/natural-events.js+++ b/web/js/map/natural-events/natural-events.js@@ -12,7 +12,11 @@ import util from '../../util/util';import { selectDate as selectDateAction } from '../../modules/date/actions';import { selected as selectedAction } from '../../modules/natural-events/actions';import {+ addLayer as addLayerAction,+ removeGroup as removeGroupAction,activateLayersForEventCategory as activateLayersForEventCategoryAction,+ toggleVisibility as toggleVisibilityAction,+ toggleGroupVisibility as toggleGroupVisibilityAction,} from '../../modules/layers/actions';import { getFilteredEvents } from '../../modules/natural-events/selectors';import { CRS } from '../../modules/map/constants';@@ -51,6 +55,28 @@ class NaturalEvents extends React.Component {this.selectEvent = this.selectEvent.bind(this);}+ componentDidMount() {+ const {+ toggleVisibility, toggleGroupVisibility, layers, selectedEvent, addLayer, defaultEventLayer,+ } = this.props;+ const defaultLayerPresent = layers.some((layer) => layer.id === defaultEventLayer);+ if (!defaultLayerPresent) {+ addLayer(defaultEventLayer);+ } else if (defaultLayerPresent && !selectedEvent.date) {+ toggleVisibility(defaultEventLayer, true);+ }++ if (!selectedEvent.date) {+ const layersToHide = [];+ layers.forEach((layer) => {+ if (layer.group === 'overlays' && layer.layergroup !== 'Reference') {+ layersToHide.push(layer.id);+ }+ });+ toggleGroupVisibility(layersToHide, false);+ }+ }+componentDidUpdate(prevProps, prevState) {const {map,@@ -77,6 +103,11 @@ class NaturalEvents extends React.Component {}}+ componentWillUnmount() {+ const { toggleVisibility, defaultEventLayer } = this.props;+ toggleVisibility(defaultEventLayer, false);+ }+zoomIfVisible({ id, date }) {const { eventsData, proj } = this.props;const event = eventsData.find((e) => e.id === id);@@ -103,7 +134,12 @@ class NaturalEvents extends React.Component {selectEvent(id, date, isInitialLoad) {const { prevSelectedEvent } = this.state;const {- selectDate, selectEventFinished, eventsData, activateLayersForEventCategory,+ selectDate,+ selectEventFinished,+ eventsData,+ activateLayersForEventCategory,+ eventLayers,+ removeGroup,} = this.props;const isIdChange = !prevSelectedEvent || prevSelectedEvent.id !== id;@@ -125,8 +161,9 @@ class NaturalEvents extends React.Component {this.getZoomPromise(event, eventDate, !isIdChange, isInitialLoad).then(() => {if (!isInitialLoad) {if (categoryChange) {- activateLayersForEventCategory(event.categories[0].title);+ removeGroup(eventLayers);}+ activateLayersForEventCategory(event.categories[0].title);}selectEventFinished();});@@ -164,7 +201,7 @@ class NaturalEvents extends React.Component {const mapStateToProps = (state) => {const {- map, proj, requestedEvents,+ map, proj, requestedEvents, layers, config,} = state;const { active, selected } = state.events;const selectedMap = map.ui.selected;@@ -175,6 +212,9 @@ const mapStateToProps = (state) => {eventsDataIsLoading: requestedEvents.isLoading,eventsData: getFilteredEvents(state),selectedEvent: selected,+ eventLayers: layers.eventLayers,+ layers: layers.active.layers,+ defaultEventLayer: config.naturalEvents.defaultLayer,};};@@ -188,17 +228,36 @@ const mapDispatchToProps = (dispatch) => ({selectEventFinished: () => {dispatch(selectedAction());},+ toggleVisibility: (layerIds, visible) => {+ dispatch(toggleVisibilityAction(layerIds, visible));+ },+ addLayer: (id) => {+ dispatch(addLayerAction(id));+ },+ removeGroup: (ids) => {+ dispatch(removeGroupAction(ids));+ },+ toggleGroupVisibility: (layerIds, visible) => {+ dispatch(toggleGroupVisibilityAction(layerIds, visible));+ },});NaturalEvents.propTypes = {activateLayersForEventCategory: PropTypes.func,+ addLayer: PropTypes.func,+ defaultEventLayer: PropTypes.string,eventsData: PropTypes.array,eventsDataIsLoading: PropTypes.bool,+ eventLayers: PropTypes.array,+ layers: PropTypes.array,selectedEvent: PropTypes.object,selectEventFinished: PropTypes.func,selectDate: PropTypes.func,+ toggleGroupVisibility: PropTypes.func,map: PropTypes.object,proj: PropTypes.object,+ removeGroup: PropTypes.func,+ toggleVisibility: PropTypes.func,};export default connect(diff --git a/web/js/modules/layers/actions.js b/web/js/modules/layers/actions.jsindex c507133e7..d08a743cd 100644--- a/web/js/modules/layers/actions.js+++ b/web/js/modules/layers/actions.js@@ -9,6 +9,7 @@ import {getLayers as getLayersSelector,getActiveLayers as getActiveLayersSelector,activateLayersForEventCategory as activateLayersForEventCategorySelector,+ findEventLayers,getGranuleLayer,getActiveGranuleLayers,} from './selectors';@@ -46,14 +47,20 @@ export function initSecondLayerGroup() {export function activateLayersForEventCategory(category) {return (dispatch, getState) => {const state = getState();++ const originalLayers = state.layers.active.layers;const newLayers = activateLayersForEventCategorySelector(state, category);const overlayGroups = getOverlayGroups(newLayers);++ const newEventLayers = findEventLayers(originalLayers, newLayers);overlayGroups.forEach((group) => { group.collapsed = true; });+dispatch({type: ADD_LAYERS_FOR_EVENT,activeString: state.compare.activeString,layers: newLayers,overlayGroups,+ eventLayers: newEventLayers,});};}diff --git a/web/js/modules/layers/reducers.js b/web/js/modules/layers/reducers.jsindex 21f95b0cb..9b4bb231b 100644--- a/web/js/modules/layers/reducers.js+++ b/web/js/modules/layers/reducers.js@@ -55,6 +55,7 @@ export const initialState = {layerConfig: {},startingLayers: [],granuleFootprints: {},+ eventLayers: [],};export function getInitialState(config) {@@ -137,6 +138,7 @@ export function layerReducer(state = initialState, action) {overlayGroups: { $set: action.overlayGroups },prevLayers: { $set: [] },},+ eventLayers: action.eventLayers === undefined ? { $push: [] } : action.eventLayers.length ? { $set: action.eventLayers } : { $push: [] },});case TOGGLE_OVERLAY_GROUPS:diff --git a/web/js/modules/layers/reducers.test.js b/web/js/modules/layers/reducers.test.jsindex 0a946c52f..73e3e4dd1 100644--- a/web/js/modules/layers/reducers.test.js+++ b/web/js/modules/layers/reducers.test.js@@ -39,11 +39,13 @@ describe('layer Reducer tests', () => {let initialState;let initialLayers;let initialGroups;+ let initialEventLayers;beforeEach(() => {initialState = getInitialState(config);initialLayers = initialState.active.layers;initialGroups = initialState.active.overlayGroups;+ initialEventLayers = [];});test('initial state has layers and overlayGroups as expected', () => {@@ -114,6 +116,7 @@ describe('layer Reducer tests', () => {activeString: 'active',layers: initialLayers,overlayGroups: initialGroups,+ eventLayers: initialEventLayers,});expect(response.active.layers).toEqual(initialLayers);expect(response.active.overlayGroups).toEqual(initialGroups);@@ -126,6 +129,7 @@ describe('layer Reducer tests', () => {activeString: 'active',layers: initialLayers,overlayGroups: initialGroups,+ eventLayers: initialEventLayers,});expect(response.active.layers).toEqual(initialLayers);expect(response.active.overlayGroups).toEqual(initialGroups);diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.jsindex e329e2ac9..8b5425b7e 100644--- a/web/js/modules/layers/selectors.js+++ b/web/js/modules/layers/selectors.js@@ -605,6 +605,18 @@ export function isRenderable(id, layers, date, bLayers, state) {return !obscured;}+export const findEventLayers = (originalLayers, newLayers) => {+ const uniqueLayers = [];++ newLayers.forEach((newLayer) => {+ if (!originalLayers.some((originalLayer) => originalLayer.id === newLayer.id)) {+ uniqueLayers.push(newLayer.id);+ }+ });++ return uniqueLayers;+};+export function activateLayersForEventCategory(state, category) {const {config: { naturalEvents: { layers } },diff --git a/web/js/modules/natural-events/actions.js b/web/js/modules/natural-events/actions.jsindex ce744e262..9d2ce9c3d 100644--- a/web/js/modules/natural-events/actions.js+++ b/web/js/modules/natural-events/actions.js@@ -68,7 +68,7 @@ export function deselectEvent(id, date) {};}-export function setEventsFilter(categories, start, end, showAll) {+export function setEventsFilter(categories, start, end, showAll, showAllTracks) {return (dispatch, getState) => {const {selectedCategories,@@ -84,6 +84,7 @@ export function setEventsFilter(categories, start, end, showAll) {start,end,showAll,+ showAllTracks,});// Only make request if something has changedif (!showAll || (prevShowAll !== showAll) || !sameCategories || !sameDates) {diff --git a/web/js/modules/natural-events/reducers.js b/web/js/modules/natural-events/reducers.jsindex 9ed805abd..adf03af89 100644--- a/web/js/modules/natural-events/reducers.js+++ b/web/js/modules/natural-events/reducers.js@@ -45,6 +45,7 @@ const eventsReducerState = {},active: false,showAll: true,+ showAllTracks: false,isAnimatingToEvent: false,selectedCategories: [],selectedDates: {@@ -92,6 +93,7 @@ export function eventsReducer(state = eventsReducerState, action) {return {...state,showAll: action.showAll,+ showAllTracks: action.showAllTracks,selectedCategories: action.categories,selectedDates: {start: action.start,diff --git a/web/scss/features/event-filter.scss b/web/scss/features/event-filter.scssindex ac8c4ad3a..15b5d2f17 100644--- a/web/scss/features/event-filter.scss+++ b/web/scss/features/event-filter.scss@@ -93,7 +93,7 @@}.wv-checkbox {- margin: 25px 10px 5px;+ margin: 15px 10px 0;display: inline-block;}