Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

measure imagery within visible extent (#4467)

Ryan Weilerdde10af6b2ef
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 153f7eef3..9b86d0eef 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,7 @@
/* eslint-disable no-await-in-loop */
import { useEffect, useState } from 'react';
import { useSelector, useDispatch } from 'react-redux';
+import { transformExtent } from 'ol/proj';
import { getActiveLayers } from '../../../../modules/layers/selectors';
import { selectDate as selectDateAction } from '../../../../modules/date/actions';
import {
@@ -26,10 +27,12 @@ function TileMeasurement({ ui }) {
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,
@@ -39,7 +42,7 @@ function TileMeasurement({ ui }) {
const [measurementsStarted, setMeasurementsStarted] = useState(false);
useEffect(() => {
- if (!measurementsStarted && activeLayers && eic) {
+ if (!measurementsStarted && activeLayers && eic && map.ui.selected) {
calculateMeasurements();
}
});
@@ -67,7 +70,9 @@ function TileMeasurement({ ui }) {
console.log(`-----Loop #${i + 1} for date ${dates[i]}-----`);
for (let j = 0; j < layers.length; j += 1) {
try {
- const wmsImage = await fetchWMSImage(layers[j].id, dates[i]);
+ const currentExtent = map.ui.selected.getView().calculateExtent(map.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);
const { threshold } = layerPixelData[layers[j].id];
if (blackPixelRatio < threshold) {
diff --git a/web/js/mapUI/components/kiosk/tile-measurement/utils/image-api-request.js b/web/js/mapUI/components/kiosk/tile-measurement/utils/image-api-request.js
index 3f667f1b1..8904d2f72 100644
--- a/web/js/mapUI/components/kiosk/tile-measurement/utils/image-api-request.js
+++ b/web/js/mapUI/components/kiosk/tile-measurement/utils/image-api-request.js
@@ -2,15 +2,25 @@
import axios from 'axios';
import { saveAs } from 'file-saver';
-export default async function fetchWMSImage(layer, date, testMode) {
+export default async function fetchWMSImage(layer, date, extent, testMode) {
const baseUrl = 'https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi';
+ const boundingBox = `${extent[0]},${extent[1]},${extent[2]},${extent[3]}`;
+ const fullExtentBBox = '-20037508.34,-20048966.1,20037508.34,20048966.1';
+ let bbox;
+ // when we are zoomed out too far, the bounding box will include NaN
+ if (boundingBox.includes('NaN')) {
+ bbox = fullExtentBBox;
+ } else {
+ bbox = boundingBox;
+ }
+
const params = {
version: '1.3.0',
service: 'WMS',
request: 'GetMap',
format: 'image/png',
STYLE: 'default',
- bbox: '-20037508.34,-20048966.1,20037508.34,20048966.1',
+ bbox,
CRS: 'EPSG:3857',
HEIGHT: '256',
WIDTH: '256',