Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

update running data to check for collapsed sidebar (#4113)

Ryan Weiler08600425e5ba
diff --git a/web/js/fixtures.js b/web/js/fixtures.js
index 1fdf0a9fe..e6bd2ce73 100644
--- a/web/js/fixtures.js
+++ b/web/js/fixtures.js
@@ -8,6 +8,7 @@ import { getInitialState as getInitialDateState } from './modules/date/reducers'
import { defaultState as initialAnimationState } from './modules/animation/reducers';
import { defaultAlertState } from './modules/alerts/reducer';
import { getInitialEventsState } from './modules/natural-events/reducers';
+import { sidebarState as initialSidebarState } from './modules/sidebar/reducers';
import util from './util/util';
const mockBaseCmrApi = 'mock.cmr.api/';
@@ -33,6 +34,7 @@ fixtures.getState = function() {
events: getInitialEventsState(fixtures.config()),
map: fixtures.map(),
animation: initialAnimationState,
+ sidebar: initialSidebarState,
proj: {
selected: {
id: 'geographic',
diff --git a/web/js/map/runningdata.js b/web/js/map/runningdata.js
index e9f400584..5b2dc6146 100644
--- a/web/js/map/runningdata.js
+++ b/web/js/map/runningdata.js
@@ -35,6 +35,8 @@ export default function MapRunningData(compareUi, store) {
// Determine if we should do anything with this vector layer
const shouldNotProcessVectorLayer = (layer) => {
+ const state = store.getState();
+ const { sidebar: { isCollapsed } } = state;
const def = lodashGet(layer, 'wv.def');
if (!def) return true;
const { wrapX, wrapadjacentdays } = def;
@@ -44,7 +46,7 @@ export default function MapRunningData(compareUi, store) {
const featureOutsideExtent = !olExtent.containsCoordinate(layer.get('extent'), coords);
const inCompareRegion = isFromActiveCompareRegion(pixel, layer.wv.group, compare, swipeOffset);
const hasPalette = !lodashIsEmpty(def.palette);
- return !isRenderedFeature || !inCompareRegion || featureOutsideExtent || !hasPalette;
+ return !isRenderedFeature || !inCompareRegion || featureOutsideExtent || !hasPalette || isCollapsed;
};
// Running data for vector layers
@@ -76,10 +78,12 @@ export default function MapRunningData(compareUi, store) {
// Determine if we should do anything with this raster layer
const shouldNotProcessRasterLayer = (layer) => {
+ const state = store.getState();
+ const { sidebar: { isCollapsed } } = state;
const type = lodashGet(layer, 'wv.def.type');
const isGranule = type === 'granule' && !layer.get('granuleGroup');
const hasPalette = !!lodashGet(layer, 'wv.def.palette');
- return isGranule || layer.isVector || !hasPalette;
+ return isGranule || layer.isVector || !hasPalette || isCollapsed;
};
// Running data for raster layers