Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-3299 View Dates queries DescribeDomains for ongoing layers (#5554)

Patrick Moulden9a00d84facad
diff --git a/web/js/components/layer/info/date-ranges.js b/web/js/components/layer/info/date-ranges.js
index e6f3fc828..d3157c7e4 100644
--- a/web/js/components/layer/info/date-ranges.js
+++ b/web/js/components/layer/info/date-ranges.js
@@ -1,27 +1,56 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ListGroup, ListGroupItem } from 'reactstrap';
+import React, { useState } from 'react';
+import { ListGroup, ListGroupItem, Spinner } from 'reactstrap';
import Scrollbar from '../../util/scrollbar';
import { coverageDateFormatter } from '../../../modules/date/util';
-export default class DateRanges extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- showRanges: false,
+const formatDateRanges = (dateRanges = []) => dateRanges.map(({ startDate, endDate }) => [startDate, endDate]);
+
+export default function DateRanges ({ layer }) {
+ const [showRanges, setShowRanges] = useState(false);
+ const [dateRanges, setDateRanges] = useState([]);
+ const { ongoing } = layer;
+
+ const getDateRanges = async () => {
+ if (dateRanges.length) return;
+ if (!ongoing) return setDateRanges(formatDateRanges(layer.dateRanges));
+ const worker = new Worker('js/workers/describe-domains.worker.js');
+ worker.onmessage = (event) => {
+ if (Array.isArray(event.data)) { // our final format is an array
+ worker.terminate(); // terminate the worker
+ const data = event.data.length ? event.data : formatDateRanges(layer.dateRanges); // fallback to layer.dateRanges if no DescribeDomains data
+ return setDateRanges(data);
+ }
+ // DOMParser is not available in workers so we parse the xml on the main thread before sending it back to the worker
+ const parser = new DOMParser();
+ const xmlDoc = parser.parseFromString(event.data, 'text/xml');
+ const domains = xmlDoc.querySelector('Domain')?.textContent || '';
+ worker.postMessage({ operation: 'mergeDomains', args: [domains, 0] });
+ };
+ worker.onerror = () => {
+ worker.terminate();
+ setDateRanges(formatDateRanges(layer.dateRanges)); // fallback to layer.dateRanges if worker fails
};
- }
+ const { startDate } = layer;
+ const endDate = layer.endDate ? new Date(layer.endDate).toISOString() : new Date().toISOString(); // default to today if no end date
+ const params = {
+ startDate,
+ endDate,
+ id: layer.id,
+ proj: 'EPSG:4326',
+ };
+ worker.postMessage({ operation: 'requestDescribeDomains', args: [params] });
+ };
- renderListItem = (layer) => layer.dateRanges
+ const renderListItem = () => dateRanges
.slice(0)
.reverse()
.map((l) => {
- const ListItemStartDate = () => coverageDateFormatter('START-DATE', l.startDate, layer.period);
- const ListItemEndDate = () => coverageDateFormatter('END-DATE', l.endDate, layer.period);
+ const ListItemStartDate = () => coverageDateFormatter('START-DATE', l[0], layer.period);
+ const ListItemEndDate = () => coverageDateFormatter('END-DATE', l.at(-1), layer.period);
return (
// notranslate included below to prevent Google Translate extension from crashing the page
- <ListGroupItem key={`${l.startDate} - ${l.endDate}`} className="notranslate">
+ <ListGroupItem key={crypto.randomUUID()} className="notranslate">
<ListItemStartDate />
{' - '}
<ListItemEndDate />
@@ -29,41 +58,36 @@ export default class DateRanges extends React.Component {
);
});
- render() {
- const { layer } = this.props;
- const { showRanges } = this.state;
- const style = showRanges ? { display: 'block' } : { display: 'none' };
- const listItems = this.renderListItem(layer);
+ const style = showRanges ? { display: 'block' } : { display: 'none' };
- return (
- <>
- <sup
- className="layer-date-ranges-button"
- onClick={() => {
- this.setState({ showRanges: !showRanges });
- }}
- >
- *View Dates
- </sup>
- <div
- style={style}
- id="layer-date-range-list-wrap"
- className="layer-date-wrap"
- >
- <div>
- <p>Date Ranges:</p>
+ return (
+ <>
+ <sup
+ className="layer-date-ranges-button"
+ onClick={() => {
+ getDateRanges();
+ setShowRanges(!showRanges);
+ }}
+ >
+ *View Dates
+ </sup>
+ <div
+ style={style}
+ id="layer-date-range-list-wrap"
+ className="layer-date-wrap"
+ >
+ <div>
+ <p>Date Ranges:</p>
+ <div style={{ display: 'flex', justifyContent: 'center' }}>
+ {dateRanges.length === 0 && <Spinner size="sm">Loading...</Spinner>}
</div>
- <Scrollbar style={{ maxHeight: 400 }}>
- <ListGroup id="layer-settings-date-range-list" className="layer-date-ranges monospace">
- {listItems}
- </ListGroup>
- </Scrollbar>
</div>
- </>
- );
- }
+ <Scrollbar style={{ maxHeight: 400 }}>
+ <ListGroup id="layer-settings-date-range-list" className="layer-date-ranges monospace">
+ {renderListItem()}
+ </ListGroup>
+ </Scrollbar>
+ </div>
+ </>
+ );
}
-
-DateRanges.propTypes = {
- layer: PropTypes.object,
-};
diff --git a/web/js/components/layer/info/info.js b/web/js/components/layer/info/info.js
index 044854a8a..37d813d7d 100644
--- a/web/js/components/layer/info/info.js
+++ b/web/js/components/layer/info/info.js
@@ -11,7 +11,6 @@ export default function LayerInfo ({ layer, measurementDescriptionPath }) {
id,
period,
startDate,
- ongoing,
} = layer;
const [layerMetadata, setLayerMetadata] = useState();
@@ -48,7 +47,7 @@ export default function LayerInfo ({ layer, measurementDescriptionPath }) {
const overlapDateRanges = hasLayerDateRange
? dateOverlap(period, dateRanges)
: [];
- return hasLayerDateRange && overlapDateRanges.overlap === false && !ongoing;
+ return hasLayerDateRange && overlapDateRanges.overlap === false;
};
const needDateRanges = getDateOverlapDateRanges();
diff --git a/web/js/components/timeline/timeline-axis/timeline-axis.js b/web/js/components/timeline/timeline-axis/timeline-axis.js
index c51c72d8a..18728d473 100644
--- a/web/js/components/timeline/timeline-axis/timeline-axis.js
+++ b/web/js/components/timeline/timeline-axis/timeline-axis.js
@@ -1360,7 +1360,7 @@ class TimelineAxis extends Component {
}
// if opted in to DescribeDomains availability, get granule date ranges if needed
if (dataAvailability === 'dd') {
- const worker = new Worker('js/workers/dd.worker.js');
+ const worker = new Worker('js/workers/describe-domains.worker.js');
worker.onmessage = (event) => {
if (Array.isArray(event.data)) { // our final format is an array
worker.terminate(); // terminate the worker
diff --git a/web/js/workers/dd.worker.js b/web/js/workers/describe-domains.worker.js
similarity index 96%
rename from web/js/workers/dd.worker.js
rename to web/js/workers/describe-domains.worker.js
index 220df803f..5a1d9df41 100644
--- a/web/js/workers/dd.worker.js
+++ b/web/js/workers/describe-domains.worker.js
@@ -19,8 +19,8 @@ async function requestDescribeDomains(params) {
proj,
} = params;
- const start = new Date(startDate).toISOString().replace('.000', '');
- const end = new Date(endDate).toISOString().replace('.000', '');
+ const start = `${new Date(startDate).toISOString().split('.')[0]}Z`;
+ const end = `${new Date(endDate).toISOString().split('.')[0]}Z`;
const describeDomainsUrl = `https://gibs.earthdata.nasa.gov/wmts/${projDict[proj]}/best/1.0.0/${id}/default/250m/all/${start}--${end}.xml`;
const describeDomainsResponse = await fetch(describeDomainsUrl);