Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2152

Jason Kent82c60b48a9f0
diff --git a/web/css/sidebar-panel.css b/web/css/sidebar-panel.css
index b266694d7..38f118600 100644
--- a/web/css/sidebar-panel.css
+++ b/web/css/sidebar-panel.css
@@ -121,7 +121,6 @@ a.atexpand {
.sidebar-panel li.item {
padding: 0;
- cursor: move;
margin: 0 auto;
}
@@ -204,7 +203,7 @@ img.sidebar-panel-item-img {
display: block;
}
-img.hideReg {
+.visibility img {
height: 14px;
width: 20px;
}
@@ -242,7 +241,7 @@ li.item.productsitem.inmotion,
border-color: #fff;
}
-.productsitem a.hdanchor.hideReg {
+.productsitem a.visibility {
width: 30px;
background-color: #ccc;
position: absolute;
@@ -250,25 +249,41 @@ li.item.productsitem.inmotion,
bottom: 0;
cursor: pointer;
border-right: 1px solid #333;
+ &.layer-enabled:hover {
+ background: #fff;
+ }
+ &.disabled:hover {
+ cursor: not-allowed;
+ }
+ &.layer-visible.disabled:hover {
+ cursor: not-allowed;
+ background: #c5c5c8;
+ .svg-inline--fa {
+ color: #333;
+ }
+ }
+ &.layer-hidden.disabled:hover {
+ background: #666;
+ cursor: not-allowed;
+ .svg-inline--fa {
+ color: #c5c5c8;
+ }
+ }
+ .layer-eye-icon {
+ text-align: center;
+ display: inline-block;
+ width: 100%;
+ position: absolute;
+ top: 50%;
+ margin-top: -10px;
+ font-size: 18px;
+ }
}
-.productsitem.layer-visible a.hdanchor:hover {
- background: #fff;
-}
-
-.productsitem .layer-eye-icon {
- text-align: center;
- display: inline-block;
- width: 100%;
- position: absolute;
- top: 50%;
- margin-top: -10px;
- font-size: 18px;
-}
.productsitem svg.svg-inline--fa {
color: #333;
}
-.productsitem .hdanchor:hover .layer-eye-icon {
+.productsitem .visibility:hover .layer-eye-icon {
color: #000;
}
.layer-hidden svg.svg-inline--fa {
@@ -447,10 +462,10 @@ li.item.productsitem.inmotion,
}
.productsitem {
+ cursor: grab;
& .layer-info {
background-color: #ccc;
min-height: 40px;
- cursor: grab;
& .layer-buttons {
position: absolute;
right: 0;
@@ -474,7 +489,6 @@ li.item.productsitem.inmotion,
& .layer-main {
width: auto;
margin-left: 30px;
- cursor: default;
min-height: 40px;
overflow: hidden;
}
@@ -484,14 +498,6 @@ li.item.productsitem.inmotion,
margin-left: 41px;
}
-.productsitem.layer-hidden a.hdanchor {
- background: #666;
-}
-
-.productsitem.layer-hidden a.hdanchor:hover {
- background: rgba(255, 255, 255, 1);
-}
-
.productsitem.layer-hidden .layer-info h4,
.productsitem.layer-hidden .layer-info p {
color: #999;
@@ -512,16 +518,21 @@ li.item.productsitem.inmotion,
height: 42px;
}
-.sidebar-panel li.item.productsitem.disabled.layer-hidden:hover {
+.productsitem.layer-hidden a.visibility {
+ background: #666;
+}
+
+.sidebar-panel li.item.productsitem.disabled:hover {
border-color: transparent;
+ cursor: default;
}
-.disabled.layer-hidden a.hdanchor:hover {
+.disabled.layer-hidden a.visibility:hover {
background: rgba(255, 255, 255, 0.2);
cursor: default;
}
-.productsitem.disabled.layer-hidden a.hdanchor:hover svg.svg-inline--fa {
+.productsitem.disabled.layer-hidden a.visibility:hover svg.svg-inline--fa {
color: #c5c5c8;
}
@@ -574,7 +585,7 @@ li.item.productsitem.inmotion,
font-size: 26px;
margin-top: -13px;
}
- a.hdanchor.hideReg {
+ a.visibility {
width: 45px;
}
}
diff --git a/web/js/containers/sidebar/layer-list.js b/web/js/containers/sidebar/layer-list.js
index ad6f4b91b..1cad58b14 100644
--- a/web/js/containers/sidebar/layer-list.js
+++ b/web/js/containers/sidebar/layer-list.js
@@ -51,7 +51,9 @@ function LayerList(props) {
toggleCollapse,
isMobile,
numVisible,
+ isAnimating,
} = props;
+
const { dragHandleProps = {} } = props;
const groupLayerIds = layers.map(({ id }) => id);
const layersInProj = layers.filter(({ projections }) => projections[projId]);
@@ -127,7 +129,7 @@ function LayerList(props) {
);
};
- const renderDropdownMenu = () => (
+ const renderDropdownMenu = () => !isAnimating && (
<Dropdown className="layer-group-more-options" isOpen={showDropdownMenu} toggle={toggleDropdownMenuVisible}>
<DropdownToggle>
<FontAwesomeIcon
@@ -209,6 +211,7 @@ LayerList.propTypes = {
dragHandleProps: PropTypes.object,
getNames: PropTypes.func,
groupId: PropTypes.string,
+ isAnimating: PropTypes.bool,
isMobile: PropTypes.bool,
isEmbedModeActive: PropTypes.bool,
layers: PropTypes.array,
@@ -225,7 +228,7 @@ LayerList.propTypes = {
const mapStateToProps = (state, ownProps) => {
const {
- embed, proj, config, map,
+ embed, proj, config, map, animation,
} = state;
const { isEmbedModeActive } = embed;
const zots = lodashGet(map, 'ui.selected')
@@ -245,6 +248,7 @@ const mapStateToProps = (state, ownProps) => {
getNames: (layerId) => getTitles(config, layerId, proj.id),
available: (layerId) => availableSelector(state)(layerId),
numVisible,
+ isAnimating: animation.isPlaying,
};
};
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index 7a51e280b..4863035d9 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-one-expression-per-line */
/* eslint-disable react/jsx-props-no-spreading */
/* eslint-disable react/no-danger */
import React, { useState, useEffect } from 'react';
@@ -33,7 +34,6 @@ import { coverageDateFormatter } from '../../modules/date/util';
const { events } = util;
const { vectorModalProps } = MODAL_PROPERTIES;
-const visibilityButtonClasses = 'hdanchor hide hideReg bank-item-img';
const getItemStyle = (isDragging, draggableStyle) => ({
// some basic styles to make the items look a bit nicer
...draggableStyle,
@@ -75,6 +75,7 @@ function LayerRow (props) {
isVectorLayer,
runningObject,
measurementDescriptionPath,
+ isAnimating,
} = props;
const encodedLayerId = util.encodeId(layer.id);
@@ -154,9 +155,9 @@ function LayerRow (props) {
}
if (layerStartDate && layerEndDate) {
- return `Data available between ${layerStartDate} - ${layerEndDate}`;
+ return (<> Data available between &#13; {layerStartDate} - {layerEndDate} </>);
} if (layerStartDate) {
- return `Data available between ${layerStartDate} - Present`;
+ return (<> Data available between &#13; {layerStartDate} - Present </>);
}
return 'No data on selected date for this layer';
};
@@ -176,20 +177,33 @@ function LayerRow (props) {
/>
</DropdownToggle>
<DropdownMenu positionFixed>
- <DropdownItem id={layerInfoBtnId} aria-label={layerInfoBtnTitle} className="button wv-layers-info" onClick={() => onInfoClick(layer, title, measurementDescriptionPath)}>
+ <DropdownItem
+ id={layerInfoBtnId}
+ aria-label={layerInfoBtnTitle}
+ className="button wv-layers-info"
+ onClick={() => onInfoClick(layer, title, measurementDescriptionPath)}
+ >
{layerInfoBtnTitle}
</DropdownItem>
- <DropdownItem id={layerOptionsBtnId} aria-label={layerOptionsBtnTitle} className="button wv-layers-options" onClick={() => onOptionsClick(layer, title)}>
+ <DropdownItem
+ id={layerOptionsBtnId}
+ aria-label={layerOptionsBtnTitle}
+ className="button wv-layers-options"
+ onClick={() => onOptionsClick(layer, title)}
+ >
{layerOptionsBtnTitle}
</DropdownItem>
- <DropdownItem id={removeLayerBtnId} onClick={() => onRemoveClick(layer.id)}>
+ <DropdownItem
+ id={removeLayerBtnId}
+ onClick={() => onRemoveClick(layer.id)}
+ >
{removeLayerBtnTitle}
</DropdownItem>
</DropdownMenu>
</Dropdown>
);
- const renderControls = () => (
+ const renderControls = () => !isAnimating && (
<>
{showDropdownBtn || isMobile ? renderDropdownMenu() : null}
<a
@@ -229,6 +243,7 @@ function LayerRow (props) {
</a>
</>
);
+
const renderVectorIcon = () => {
const classNames = hasClickableFeature
? 'layer-pointer-icon'
@@ -265,24 +280,39 @@ function LayerRow (props) {
toggleShowButtons(false);
};
- const baseClasses = 'item productsitem';
- const containerClass = isDisabled
- ? `${baseClasses} disabled layer-hidden`
- : !isVisible
- ? `${baseClasses} layer-hidden`
- : zot
- ? `${baseClasses} layer-enabled layer-visible zotted`
- : `${baseClasses} layer-enabled layer-visible`;
- const visibilityToggleClass = isDisabled
- ? `${visibilityButtonClasses} layer-hidden`
- : !isVisible
- ? `${visibilityButtonClasses} layer-hidden`
- : `${visibilityButtonClasses} layer-enabled layer-visible`;
+ const getLayerItemClasses = () => {
+ let baseClasses = 'item productsitem layer-enabled';
+ if (isAnimating) baseClasses += ' disabled';
+ if (!isVisible || isDisabled) {
+ baseClasses += ' layer-hidden';
+ } else {
+ baseClasses += ' layer-visible';
+ }
+ if (zot) baseClasses += ' zotted';
+ return baseClasses;
+ };
+
+ const getVisibilityToggleClass = () => {
+ let baseClasses = 'visibility';
+ if (isDisabled || isAnimating) {
+ baseClasses += ' disabled';
+ } else {
+ baseClasses += ' layer-enabled';
+ }
+ if (isVisible && !isDisabled) {
+ baseClasses += ' layer-visible';
+ } else {
+ baseClasses += ' layer-hidden';
+ }
+ return baseClasses;
+ };
+
const visibilityTitle = !isVisible && !isDisabled
? 'Show layer'
: isDisabled
? getDisabledTitle(layer)
: 'Hide layer';
+
const visibilityIconClass = isDisabled
? 'ban'
: !isVisible
@@ -293,16 +323,18 @@ function LayerRow (props) {
<>
<a
id={`hide${encodedLayerId}`}
- className={visibilityToggleClass}
+ className={getVisibilityToggleClass()}
aria-label={visibilityTitle}
- onClick={() => toggleVisibility(layer.id, !isVisible)}
+ onClick={() => !isAnimating && !isDisabled && toggleVisibility(layer.id, !isVisible)}
>
- <UncontrolledTooltip
- placement="right"
- target={`hide${encodedLayerId}`}
- >
- {visibilityTitle}
- </UncontrolledTooltip>
+ {!isAnimating && (
+ <UncontrolledTooltip
+ placement="right"
+ target={`hide${encodedLayerId}`}
+ >
+ {visibilityTitle}
+ </UncontrolledTooltip>
+ )}
<FontAwesomeIcon icon={visibilityIconClass} className="layer-eye-icon" />
</a>
@@ -335,7 +367,7 @@ function LayerRow (props) {
return (
<Draggable
- isDragDisabled={isEmbedModeActive}
+ isDragDisabled={isEmbedModeActive || isAnimating}
draggableId={`${encodedLayerId}-${compareState}`}
index={index}
direction="vertical"
@@ -343,7 +375,7 @@ function LayerRow (props) {
{(provided, snapshot) => (isInProjection ? (
<li
id={`${compareState}-${encodedLayerId}`}
- className={containerClass}
+ className={getLayerItemClasses()}
style={getItemStyle(snapshot.isDragging, provided.draggableProps.style)}
ref={provided.innerRef}
onMouseOver={mouseOver}
@@ -374,7 +406,7 @@ const makeMapStateToProps = () => {
compareState,
} = ownProps;
const {
- browser, palettes, config, embed, map, compare, proj, ui, globalUnit,
+ browser, palettes, config, embed, map, compare, proj, ui, globalUnit, animation,
} = state;
const isMobile = browser.lessThan.medium;
const { isDistractionFreeModeActive } = ui;
@@ -407,6 +439,7 @@ const makeMapStateToProps = () => {
isMobile,
isVisible,
isVectorLayer: isVector,
+ isAnimating: animation.isPlaying,
hasClickableFeature: isVector && isVisible && isVectorLayerClickable(layer, mapRes, proj.id, isMobile),
hasPalette,
getPalette: (layerId, i) => getPalette(layer.id, i, compareState, state),
@@ -518,4 +551,5 @@ LayerRow.propTypes = {
openVectorAlertModal: PropTypes.func,
zot: PropTypes.object,
isVectorLayer: PropTypes.bool,
+ isAnimating: PropTypes.bool,
};
diff --git a/web/js/containers/sidebar/layers-container.js b/web/js/containers/sidebar/layers-container.js
index 981687754..76c2cc6a5 100644
--- a/web/js/containers/sidebar/layers-container.js
+++ b/web/js/containers/sidebar/layers-container.js
@@ -29,6 +29,7 @@ function LayersContainer (props) {
isCompareActive,
isEmbedModeActive,
isMobile,
+ isAnimating,
overlayGroups,
overlays,
reorderOverlayGroups,
@@ -66,7 +67,7 @@ function LayersContainer (props) {
key={groupName}
draggableId={groupName}
index={idx}
- isDragDisabled={isEmbedModeActive}
+ isDragDisabled={isEmbedModeActive || isAnimating}
>
{(provided) => (
<li
@@ -178,7 +179,7 @@ function LayersContainer (props) {
const mapStateToProps = (state, ownProps) => {
const { compareState } = ownProps;
const {
- browser, compare, embed, layers,
+ browser, compare, embed, layers, animation,
} = state;
const isCompareActive = compare.active;
const { isEmbedModeActive } = embed;
@@ -195,6 +196,7 @@ const mapStateToProps = (state, ownProps) => {
}
return {
+ isAnimating: animation.isPlaying,
isCompareActive,
isEmbedModeActive,
isMobile,
@@ -232,6 +234,7 @@ LayersContainer.propTypes = {
groupOverlays: PropTypes.bool,
height: PropTypes.number,
isActive: PropTypes.bool,
+ isAnimating: PropTypes.bool,
isCompareActive: PropTypes.bool,
isEmbedModeActive: PropTypes.bool,
isMobile: PropTypes.bool,