Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

refactor useSelector hooks (#4486)

Ryan Weilerd61f7f7a604d
diff --git a/web/js/components/kiosk/animation-tile-check/animation-tile-check.js b/web/js/components/kiosk/animation-tile-check/animation-tile-check.js
index 6448e91a4..d386b176f 100644
--- a/web/js/components/kiosk/animation-tile-check/animation-tile-check.js
+++ b/web/js/components/kiosk/animation-tile-check/animation-tile-check.js
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useSelector, shallowEqual } from 'react-redux';
import PropTypes from 'prop-types';
import util from '../../../util/util';
import { getActiveLayers } from '../../../modules/layers/selectors';
@@ -14,14 +14,10 @@ function AnimationTileCheck(props) {
isPlaying,
} = props;
- const {
- config, proj, zoom, activeLayers,
- } = useSelector((state) => ({
- config: state.config,
- proj: state.proj.selected,
- zoom: Math.floor(state.map.ui.selected.getView().getZoom()),
- activeLayers: getActiveLayers(state, state.compare.activeString).map((layer) => layer),
- }));
+ const config = useSelector((state) => state.config, shallowEqual);
+ const proj = useSelector((state) => state.proj.selected, shallowEqual);
+ const zoom = useSelector((state) => Math.floor(state.map.ui.selected.getView().getZoom()));
+ const activeLayers = useSelector((state) => getActiveLayers(state, state.compare.activeString), shallowEqual);
const [frameDates, setFrameDates] = useState([]);
diff --git a/web/js/components/map/loading-spinner.js b/web/js/components/map/loading-spinner.js
index 95b98cd47..eefc81482 100644
--- a/web/js/components/map/loading-spinner.js
+++ b/web/js/components/map/loading-spinner.js
@@ -3,15 +3,11 @@ import { Spinner } from 'reactstrap';
import { useSelector } from 'react-redux';
function LoadingIndicator() {
- const {
- msg,
- shouldSpinnerShow,
- isMobile,
- } = useSelector((state) => ({
- msg: state.loading.msg,
- shouldSpinnerShow: state.loading.isLoading && !state.ui.isKioskModeActive,
- isMobile: state.screenSize.isMobileDevice,
- }));
+ const msg = useSelector((state) => state.loading.msg);
+ const isMobile = useSelector((state) => state.screenSize.isMobileDevice);
+ const isLoading = useSelector((state) => state.loading.isLoading);
+ const isKioskModeActive = useSelector((state) => state.ui.isKioskModeActive);
+ const shouldSpinnerShow = isLoading && !isKioskModeActive;
const spinnerStyle = isMobile ? {
position: 'absolute',
diff --git a/web/js/components/measure-tool/measure-button.js b/web/js/components/measure-tool/measure-button.js
index 8f8051cff..e2b2e6388 100644
--- a/web/js/components/measure-tool/measure-button.js
+++ b/web/js/components/measure-tool/measure-button.js
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
import { Button, UncontrolledTooltip } from 'reactstrap';
import googleTagManager from 'googleTagManager';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -23,11 +23,9 @@ const helpMsg = 'Click: Add a point. Right-click: Cancel. Double-click to comple
const MeasureButton = function () {
const dispatch = useDispatch();
- const { isActive, isDistractionFreeModeActive, isMobile } = useSelector((state) => ({
- isActive: state.measure.isActive,
- isDistractionFreeModeActive: state.ui.isDistractionFreeModeActive,
- isMobile: state.screenSize.isMobileDevice,
- }), shallowEqual);
+ const isActive = useSelector((state) => state.measure.isActive);
+ const isDistractionFreeModeActive = useSelector((state) => state.ui.isDistractionFreeModeActive);
+ const isMobile = useSelector((state) => state.screenSize.isMobileDevice);
const [showAlert, setShowAlert] = useState(true);
const [isTouchDevice, setIsTouchDevice] = useState(false);
diff --git a/web/js/components/measure-tool/measure-menu.js b/web/js/components/measure-tool/measure-menu.js
index 0ea3cbb92..d936d891b 100644
--- a/web/js/components/measure-tool/measure-menu.js
+++ b/web/js/components/measure-tool/measure-menu.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { useSelector, useDispatch, shallowEqual } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
import { Form } from 'reactstrap';
import { onToggle as onToggleAction } from '../../modules/modal/actions';
@@ -49,14 +49,10 @@ const MeasureMenu = function () {
const onToggle = () => { dispatch(onToggleAction()); };
const changeUnits = (units) => { dispatch(changeUnitsAction(units)); };
- const {
- isMobile, isTouchDevice, unitOfMeasure, measurementsInProj,
- } = useSelector((state) => ({
- isMobile: state.screenSize.isMobileDevice,
- isTouchDevice: state.modal.customProps.touchDevice,
- unitOfMeasure: state.measure.unitOfMeasure,
- measurementsInProj: !!Object.keys(state.measure.allMeasurements[state.proj.selected.crs]).length,
- }), shallowEqual);
+ const isMobile = useSelector((state) => state.screenSize.isMobileDevice);
+ const isTouchDevice = useSelector((state) => state.modal.customProps.touchDevice);
+ const unitOfMeasure = useSelector((state) => state.measure.unitOfMeasure);
+ const measurementsInProj = useSelector((state) => !!Object.keys(state.measure.allMeasurements[state.proj.selected.crs]).length);
const listSize = isTouchDevice ? 'large' : 'small';
DOWNLOAD_GEOJSON.hidden = !measurementsInProj || isMobile;
diff --git a/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js b/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js
index 5c8f758d1..e9f931615 100644
--- a/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js
+++ b/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector, useDispatch, shallowEqual } from 'react-redux';
import PropTypes from 'prop-types';
import {
onActivate as initiateAnimationAction,
@@ -13,25 +13,15 @@ function KioskAnimations({ ui }) {
const playKioskAnimation = (startDate, endDate) => { dispatch(playKioskAnimationAction(startDate, endDate)); };
const selectDate = (date) => { dispatch(selectDateAction(date)); };
- const {
- selectedDate,
- isAnimationPlaying,
- isKioskModeActive,
- eic,
- map,
- eicAnimationMode,
- eicMeasurementComplete,
- eicMeasurementAborted,
- } = useSelector((state) => ({
- selectedDate: state.date.selected,
- isAnimationPlaying: state.animation.isPlaying,
- isKioskModeActive: state.ui.isKioskModeActive,
- eic: state.ui.eic,
- eicAnimationMode: state.ui.eic === 'sa' || state.ui.eic === 'da',
- map: state.map,
- eicMeasurementComplete: state.ui.eicMeasurementComplete,
- eicMeasurementAborted: state.ui.eicMeasurementAborted,
- }));
+ const selectedDate = useSelector((state) => state.date.selected);
+ const isAnimationPlaying = useSelector((state) => state.animation.isPlaying);
+ const isKioskModeActive = useSelector((state) => state.ui.isKioskModeActive);
+ const eic = useSelector((state) => state.ui.eic);
+ const map = useSelector((state) => state.map, shallowEqual);
+ const eicMeasurementComplete = useSelector((state) => state.ui.eicMeasurementComplete);
+ const eicMeasurementAborted = useSelector((state) => state.ui.eicMeasurementAborted);
+
+ const eicAnimationMode = eic === 'sa' || eic === 'da';
const [subdailyAnimationDateUpdated, setSubdailyAnimationDateUpdated] = useState(false);
diff --git a/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js b/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js
index 9b86d0eef..56f047dc1 100644
--- a/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js
+++ b/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js
@@ -1,6 +1,6 @@
/* eslint-disable no-await-in-loop */
import { useEffect, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector, useDispatch, shallowEqual } from 'react-redux';
import { transformExtent } from 'ol/proj';
import { getActiveLayers } from '../../../../modules/layers/selectors';
import { selectDate as selectDateAction } from '../../../../modules/date/actions';
@@ -24,25 +24,14 @@ function TileMeasurement({ ui }) {
const toggleStaticMap = (isActive) => { dispatch(toggleStaticMapAction(isActive)); };
const toggleGroupVisibility = (ids, visible) => { dispatch(toggleGroupVisiblityAction(ids, visible)); };
- const {
- activeString,
- activeLayers,
- map,
- eic,
- realTime,
- } = useSelector((state) => ({
- activeLayers: getActiveLayers(state, state.compare.activeString).map((layer) => layer),
- map: state.map,
- eic: state.ui.eic,
- realTime: state.date.appNow,
- activeString: state.compare.activeString,
- }));
- const activeLayerIds = useSelector((state) => getActiveLayers(state, activeString).map((layer) => layer.id));
+ const eic = useSelector((state) => state.ui.eic);
+ const realTime = useSelector((state) => state.date.appNow);
+ const activeLayers = useSelector((state) => getActiveLayers(state, state.compare.activeString), shallowEqual);
const [measurementsStarted, setMeasurementsStarted] = useState(false);
useEffect(() => {
- if (!measurementsStarted && activeLayers && eic && map.ui.selected) {
+ if (!measurementsStarted && activeLayers && eic && ui.selected) {
calculateMeasurements();
}
});
@@ -70,7 +59,7 @@ function TileMeasurement({ ui }) {
console.log(`-----Loop #${i + 1} for date ${dates[i]}-----`);
for (let j = 0; j < layers.length; j += 1) {
try {
- const currentExtent = map.ui.selected.getView().calculateExtent(map.ui.selected.getSize());
+ const currentExtent = ui.selected.getView().calculateExtent(ui.selected.getSize());
const mercatorExtent = transformExtent(currentExtent, 'EPSG:4326', 'EPSG:3857');
const wmsImage = await fetchWMSImage(layers[j].id, dates[i], mercatorExtent);
const blackPixelRatio = await calculatePixels(wmsImage);
@@ -107,7 +96,6 @@ function TileMeasurement({ ui }) {
if (!firstLayerWithBestDate) {
console.error(`No date found that satisfies the full imagery thresholds. There is no best date selected for ${layers[0].id}.`);
- // display static map??
return dates[0];
}
console.error(`No date found that satisfies imagery thresholds. Returning best date for ${layers[0].id} on ${firstLayerWithBestDate}.`);
@@ -160,6 +148,7 @@ function TileMeasurement({ ui }) {
} else if (!loadedTiles && abortProceedure) {
console.log('EIC measure process aborted... No tiles found on map... Displaying static map...');
toggleStaticMap(true);
+ const activeLayerIds = activeLayers.map((layer) => layer.id);
toggleGroupVisibility(activeLayerIds, false);
setEICMeasurementAborted();
}
diff --git a/web/js/mapUI/mapUI.js b/web/js/mapUI/mapUI.js
index faf4fc326..6f9a61c5a 100644
--- a/web/js/mapUI/mapUI.js
+++ b/web/js/mapUI/mapUI.js
@@ -63,6 +63,7 @@ function MapUI(props) {
config,
dateCompareState,
embed,
+ isEICModeActive,
lastArrowDirection,
layerQueue,
lastPreloadDate,
@@ -399,17 +400,21 @@ function MapUI(props) {
<GranuleHover granuleFootprints={granuleFootprints} ui={ui} />
<MouseMoveEvents ui={ui} compareMapUi={compareMapUi} />
<BufferQuickAnimate action={quickAnimateAction} />
- <KioskAnimations ui={ui} />
- <TileMeasurement ui={ui} />
+ { isEICModeActive
+ && (
+ <>
+ <KioskAnimations ui={ui} />
+ <TileMeasurement ui={ui} />
+ </>
+ )}
{tileImageTestMode && <TileImagePixelTest />}
-
</>
);
}
const mapStateToProps = (state) => {
const {
- compare, config, date, embed, layers, map, palettes, proj, vectorStyles,
+ compare, config, date, embed, layers, map, palettes, proj, vectorStyles, ui,
} = state;
const {
arrowDown, lastArrowDirection, lastPreloadDate, preloaded, selected, selectedB,
@@ -430,6 +435,7 @@ const mapStateToProps = (state) => {
const useDate = selectedDate || (preloaded ? lastPreloadDate : getSelectedDate(state));
const nextDate = getNextDateTime(state, 1, useDate);
const prevDate = getNextDateTime(state, -1, useDate);
+ const isEICModeActive = ui.eic !== '';
return {
activeLayers,
@@ -439,6 +445,7 @@ const mapStateToProps = (state) => {
compare,
dateCompareState,
embed,
+ isEICModeActive,
lastArrowDirection,
lastPreloadDate,
layers,
@@ -483,6 +490,7 @@ MapUI.propTypes = {
config: PropTypes.object,
dateCompareState: PropTypes.object,
embed: PropTypes.object,
+ isEICModeActive: PropTypes.bool,
lastArrowDirection: PropTypes.string,
layerQueue: PropTypes.object,
layers: PropTypes.object,