Interactive interface for browsing global, full-resolution satellite imagery
show measurement metadata in layer info modal
Jason Kentf3a104287cb6
diff --git a/web/css/layers.css b/web/css/layers.cssindex 0b5f23421..c8c78b127 100644--- a/web/css/layers.css+++ b/web/css/layers.css@@ -293,6 +293,9 @@.layer-metadata ul {list-style-position: inside;}+.layer-metadata hr {+ background: #aaa;+}.layers-all .source-metadata div,.layers-all .source-metadata p,diff --git a/web/css/sidebar.css b/web/css/sidebar.cssindex ff187183a..521a653b3 100644--- a/web/css/sidebar.css+++ b/web/css/sidebar.css@@ -459,6 +459,10 @@ footer .compare-toggle-button {.layer-info-modal {width: 500px;+ .modal-body {+ overflow-y: scroll;+ max-height: calc(100vh - 200px);+ }}.layer-settings-modal {diff --git a/web/js/components/layer/info/info-modal.js b/web/js/components/layer/info/info-modal.jsindex afc46bbb2..142df29da 100644--- a/web/js/components/layer/info/info-modal.js+++ b/web/js/components/layer/info/info-modal.js@@ -1,22 +1,38 @@-import React from 'react';+import React, { useState, useEffect } from 'react';import PropTypes from 'prop-types';import LayerInfo from './info';-import Scrollbars from '../../util/scrollbar';+import util from '../../../util/util';export default function LayerInfoModal(props) {- const { screenHeight, layer } = props;+ const { layer, measurementDescriptionPath } = props;+ const [metadata, setMetadata] = useState();++ const initMetadata = async () => {+ if (!metadata && measurementDescriptionPath) {+ const url = `config/metadata/layers/${measurementDescriptionPath}.html`;+ const data = await util.get(url);+ setMetadata(data || 'No metadata found.');+ }+ };++ useEffect(() => {+ initMetadata();+ }, [layer]);return (- <Scrollbars style={{ maxHeight: `${screenHeight - 200}px` }}>+ <div id="layer-description" className="layer-description"><LayerInfo layer={layer} />- {/*- Put the source specific metadata here as well- */}- </Scrollbars>+ {metadata && (+ <div+ className="layer-metadata"+ dangerouslySetInnerHTML={{ __html: metadata }}+ />+ )}+ </div>);}LayerInfoModal.propTypes = {- screenHeight: PropTypes.number,layer: PropTypes.object,+ measurementDescriptionPath: PropTypes.string,};diff --git a/web/js/components/layer/info/info.js b/web/js/components/layer/info/info.jsindex a5bcdc874..d76b3f62b 100644--- a/web/js/components/layer/info/info.js+++ b/web/js/components/layer/info/info.js@@ -1,4 +1,4 @@-import React from 'react';+import React, { useState, useEffect } from 'react';import PropTypes from 'prop-types';import { dateOverlap } from '../../../modules/layers/util';import DateRanges from './date-ranges';@@ -8,96 +8,77 @@ function configureTemporalDate(dateType, date, period) {return util.coverageDateFormatter(dateType, date, period);}-class LayerInfo extends React.Component {- constructor(props) {- super(props);- this.state = {- metaData: null,- };- this.getSourceMetadata(props.layer);- }+export default function LayerInfo ({ layer, screenHeight }) {+ const {+ dateRanges,+ endDate,+ id,+ period,+ startDate,+ } = layer;- getSourceMetadata(layer) {+ const [metadata, setMetadata] = useState();++ useEffect(() => {+ getSourceMetadata(layer);+ }, [layer]);++ const getSourceMetadata = async () => {if (layer.description) {- util- .get(`config/metadata/layers/${layer.description}.html`)- .then((data) => {- if (!data) {- data = 'There is no description provided for this layer.';- }- this.setState({ metaData: data });- })- .catch((error) => {- console.warn(error);- this.setState({- metaData: 'There was an error loading metadata for this layer.',- });- });+ const data = await util.get(`config/metadata/layers/${layer.description}.html`);+ setMetadata(data || 'No description was found for this layer.');}- }+ };- getDateOverlapDateRanges = () => {- const { layer } = this.props;- const { dateRanges, period } = layer;+ const getDateOverlapDateRanges = () => {const hasLayerDateRange = dateRanges && dateRanges.length > 1;const overlapDateRanges = hasLayerDateRange? dateOverlap(period, dateRanges): [];return hasLayerDateRange && overlapDateRanges.overlap === false;- }+ };- render() {- const { layer, screenHeight } = this.props;- const { metaData } = this.state;- const {- endDate,- id,- period,- startDate,- } = layer;- const needDateRanges = this.getDateOverlapDateRanges();- return (- <div id="layer-description" className="layer-description">- {startDate || endDate ? (- <div id="layer-date-range" className="layer-date-range">- <span id={`${id}-startDate`} className="layer-date-start">- {startDate- ? `Temporal coverage: ${- configureTemporalDate('START-DATE', startDate, period)}`+ const needDateRanges = getDateOverlapDateRanges();++ return (+ <div id="layer-description" className="layer-description">+ {startDate || endDate ? (+ <div id="layer-date-range" className="layer-date-range">+ <span id={`${id}-startDate`} className="layer-date-start">+ {startDate+ ? `Temporal coverage: ${+ configureTemporalDate('START-DATE', startDate, period)}`+ : ''}+ </span>+ <span id={`${id}-endDate`} className="layer-date-end">+ {startDate && endDate+ ? ` - ${+ configureTemporalDate('END-DATE', endDate, period)}`+ : startDate+ ? ' - Present': ''}- </span>- <span id={`${id}-endDate`} className="layer-date-end">- {startDate && endDate- ? ` - ${- configureTemporalDate('END-DATE', endDate, period)}`- : startDate- ? ' - Present'- : ''}- </span>- {needDateRanges+ </span>+ {needDateRanges&& <DateRanges layer={layer} screenHeight={screenHeight} />}- </div>- )- : ''}- {metaData ? (-- <div- id="layer-metadata"- className="layer-metadata"- dangerouslySetInnerHTML={{ __html: metaData }}- />+ </div>+ )+ : ''}+ {metadata ? (+ <div+ id="layer-metadata"+ className="layer-metadata"+ dangerouslySetInnerHTML={{ __html: metadata }}+ />- ) : (- <div id="layer-metadata" className="layer-metadata">- <p>Loading MetaData...</p>- </div>- )}- </div>- );- }+ ) : (+ <div id="layer-metadata" className="layer-metadata">+ <p>Loading MetaData...</p>+ </div>+ )}+ </div>+ );}-export default LayerInfo;LayerInfo.propTypes = {layer: PropTypes.object,diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.jsindex 85a3020c6..427748eb2 100644--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js@@ -72,13 +72,13 @@ class MeasurementMetadataDetail extends React.Component {<h3>{title}</h3></div><div className="source-metadata">+ <div dangerouslySetInnerHTML={{ __html: data }} />{layers.map((layer) => (- <div key={layer.id}>+ <div className="layer-descriptionx" key={layer.id}><h3>{layer.title}</h3><LayerInfo key={layer.id} layer={layer} /></div>))}- <div dangerouslySetInnerHTML={{ __html: data }} /></div></div>);diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.jsindex 860c2dda2..3a7b0865d 100644--- a/web/js/containers/sidebar/layer-row.js+++ b/web/js/containers/sidebar/layer-row.js@@ -28,7 +28,7 @@ import OrbitTrack from './orbit-track';import Zot from './zot';import { isVectorLayerClickable } from '../../modules/layers/util';import { MODAL_PROPERTIES } from '../../modules/alerts/constants';-import { getActiveLayers } from '../../modules/layers/selectors';+import { getActiveLayers, makeGetDescription } from '../../modules/layers/selectors';const { events } = util;const { vectorModalProps } = MODAL_PROPERTIES;@@ -72,6 +72,7 @@ function LayerRow (props) {tracksForLayer,isVectorLayer,runningObject,+ measurementDescriptionPath,} = props;const encodedLayerId = util.encodeId(layer.id);@@ -106,8 +107,8 @@ function LayerRow (props) {}};- // Request the layer palette only if it hasn't been loaded and is not currently being loadeduseEffect(() => {+ // Request the layer palette only if it hasn't been loaded and is not currently being loadedif (!isLoading && layer && hasPalette && lodashIsEmpty(renderedPalette)) {requestPalette(layer.id);}@@ -186,7 +187,7 @@ function LayerRow (props) {aria-label={layerInfoBtnTitle}className={isMobile ? 'hidden wv-layers-info' : 'button wv-layers-info'}onMouseDown={stopPropagation}- onClick={() => onInfoClick(layer, title)}+ onClick={() => onInfoClick(layer, title, measurementDescriptionPath)}><UncontrolledTooltip placement="top" target={layerInfoBtnId}>{layerInfoBtnTitle}@@ -334,50 +335,56 @@ function LayerRow (props) {);}-const mapStateToProps = (state, ownProps) => {- const {- layer,- isVisible,- compareState,- } = ownProps;- const {- palettes, config, embed, map, compare, proj, ui,- } = state;- const { isDistractionFreeModeActive } = ui;- const hasPalette = !lodashIsEmpty(layer.palette);- const renderedPalettes = palettes.rendered;- const paletteName = lodashGet(config, `layers['${layer.id}'].palette.id`);- const paletteLegends = hasPalette && renderedPalettes[paletteName]- ? getPaletteLegends(layer.id, compareState, state)- : [];- const isCustomPalette = hasPalette && palettes.custom[layer.id];- const { isEmbedModeActive } = embed;- const selectedMap = lodashGet(map, 'ui.selected');- const isVector = layer.type === 'vector';- const mapRes = selectedMap ? selectedMap.getView().getResolution() : null;- const tracksForLayer = getActiveLayers(state).filter(- (activeLayer) => (layer.tracks || []).some((track) => activeLayer.id === track),- );+const makeMapStateToProps = () => {+ const getDescriptionPath = makeGetDescription();+ return (state, ownProps) => {+ const {+ layer,+ isVisible,+ compareState,+ } = ownProps;+ const {+ palettes, config, embed, map, compare, proj, ui,+ } = state;+ const { isDistractionFreeModeActive } = ui;+ const hasPalette = !lodashIsEmpty(layer.palette);+ const renderedPalettes = palettes.rendered;+ const paletteName = lodashGet(config, `layers['${layer.id}'].palette.id`);+ const paletteLegends = hasPalette && renderedPalettes[paletteName]+ ? getPaletteLegends(layer.id, compareState, state)+ : [];+ const isCustomPalette = hasPalette && palettes.custom[layer.id];+ const { isEmbedModeActive } = embed;+ const selectedMap = lodashGet(map, 'ui.selected');+ const isVector = layer.type === 'vector';+ const mapRes = selectedMap ? selectedMap.getView().getResolution() : null;+ const tracksForLayer = getActiveLayers(state).filter(+ (activeLayer) => (layer.tracks || []).some((track) => activeLayer.id === track),+ );+ const measurementDescriptionPath = getDescriptionPath(state, ownProps);- return {- compare,- tracksForLayer,- layer,- isVisible,- paletteLegends,- isCustomPalette,- isDistractionFreeModeActive,- isEmbedModeActive,- isLoading: palettes.isLoading[paletteName],- renderedPalette: renderedPalettes[paletteName],- isVectorLayer: isVector,- hasClickableFeature: isVector && isVisible && isVectorLayerClickable(layer, mapRes, proj.id),- isMobile: state.browser.lessThan.medium,- hasPalette,- getPalette: (layerId, i) => getPalette(layer.id, i, compareState, state),+ return {+ compare,+ tracksForLayer,+ layer,+ measurementDescriptionPath,+ isCustomPalette,+ isDistractionFreeModeActive,+ isEmbedModeActive,+ isLoading: palettes.isLoading[paletteName],+ isMobile: state.browser.lessThan.medium,+ isVisible,+ isVectorLayer: isVector,+ hasClickableFeature: isVector && isVisible && isVectorLayerClickable(layer, mapRes, proj.id),+ hasPalette,+ getPalette: (layerId, i) => getPalette(layer.id, i, compareState, state),+ paletteLegends,+ renderedPalette: renderedPalettes[paletteName],+ };};};+const mapDispatchToProps = (dispatch) => ({toggleVisibility: (id, isVisible) => {dispatch(toggleVisibility(id, isVisible));@@ -410,7 +417,7 @@ const mapDispatchToProps = (dispatch) => ({}),);},- onInfoClick: (layer, title) => {+ onInfoClick: (layer, title, description) => {const key = `LAYER_INFO_MODAL-${layer.id}`;googleTagManager.pushEvent({event: 'sidebar_layer_info',@@ -428,6 +435,7 @@ const mapDispatchToProps = (dispatch) => ({size: 'lg',bodyComponentProps: {layer,+ measurementDescriptionPath: description,},}),);@@ -438,7 +446,7 @@ const mapDispatchToProps = (dispatch) => ({});export default connect(- mapStateToProps,+ makeMapStateToProps,mapDispatchToProps,)(LayerRow);@@ -462,6 +470,7 @@ LayerRow.propTypes = {isVisible: PropTypes.bool,layer: PropTypes.object,compareState: PropTypes.string,+ measurementDescriptionPath: PropTypes.string,names: PropTypes.object,onInfoClick: PropTypes.func,onOptionsClick: PropTypes.func,diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.jsindex 54fded56c..173e8c596 100644--- a/web/js/modules/layers/selectors.js+++ b/web/js/modules/layers/selectors.js@@ -18,6 +18,8 @@ const getConfigParameters = ({ config }) => (config ? config.parameters : {});const getProjState = ({ proj }) => proj;const getCompareState = ({ compare }) => compare;const getLayerState = ({ layers }) => layers;+const getConfig = ({ config }) => config;+const getLayerId = (state, { layer }) => layer.id;/*** Is overlay grouping currently enabled?@@ -144,6 +146,17 @@ export function hasMeasurementSource(current, config, projId) {return hasSource;}+export const makeGetDescription = () => createSelector(+ [getConfig, getLayerId],+ (config, layerId) => {+ const measurements = Object.values(config.measurements);+ const [setting] = measurements+ .flatMap(({ sources }) => Object.values(sources))+ .filter(({ settings }) => settings.find((id) => id === layerId));+ return (setting || {}).description;+ },+);+/*** var hasMeasurementSetting - Checks the (current) measurement's source* for a setting and returns true if present.