Interactive interface for browsing global, full-resolution satellite imagery
EIC Fix (#4808)
Ryan Weilerae96333ced7b
diff --git a/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js b/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.jsindex e8472ca3d..0732dd422 100644--- a/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js+++ b/web/js/mapUI/components/kiosk/tile-measurement/tile-measurement.js@@ -45,6 +45,16 @@ function TileMeasurement({ ui }) {return dates;};+ // returns the date of the first layer that has a best date+ function findBestDate(layers, bestDates) {+ // eslint-disable-next-line no-restricted-syntax+ for (const layer of layers) {+ if (bestDates[layer.id]) {+ return bestDates[layer.id].date;+ }+ }+ }+// #4 Loop through layers and dates to find the first date that satisfies full imagery thresholdsconst findFullImageryDate = async (layers, dates) => {console.log('Date range found... Finding date with satisfactory imagery...');@@ -76,15 +86,7 @@ function TileMeasurement({ ui }) {}layersMeetingThresholdForDate = 0;}- // returns the date of the first layer that has a best date- function findBestDate(layers, bestDates) {- // eslint-disable-next-line no-restricted-syntax- for (const layer of layers) {- if (bestDates[layer.id]) {- return bestDates[layer.id].date;- }- }- }+const firstLayerWithBestDate = findBestDate(layers, bestDates);@@ -96,6 +98,7 @@ function TileMeasurement({ ui }) {return firstLayerWithBestDate;};+// #5 Update the date of the map to the date that satisfies the full imagery thresholdconst updateDate = (fullImageryDate, layerPeriod) => {console.log('Updating application date...');@@ -132,6 +135,7 @@ function TileMeasurement({ ui }) {const tileCount = countTilesForSpecifiedLayers(ui, layersToMeasure);const loadedTiles = tileCount.totalLoadedTileCount > 0;console.log(`Total tiles loaded: ${tileCount.totalLoadedTileCount} and abortProceedure === ${abortProceedure}}`);+if ((eic === 'da' || eic === 'sa') && !abortProceedure) {setEICMeasurementComplete();}@@ -141,7 +145,7 @@ function TileMeasurement({ ui }) {} else if (loadedTiles && abortProceedure) {console.log('EIC measure process aborted... Loaded map tiles found... Leaving map as is...');setEICMeasurementAborted();- } else if (!loadedTiles) {+ } 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);@@ -173,7 +177,11 @@ function TileMeasurement({ ui }) {}const fullImageryDate = await findFullImageryDate(measurementLayers, dateRange);- if (!fullImageryDate) return verifyTilesAndHandleErrors(true);++ // If we are using the best date, we need to make sure there are tiles on the map so we include the abort prodcedure parameter+ // This allows us to fall back to the static map if the best date fails as a last resort+ const bestDate = findBestDate(measurementLayers, bestDates);+ if (!fullImageryDate || bestDate === fullImageryDate) return verifyTilesAndHandleErrors(true);// Format date based on period and dispatch redux actionupdateDate(fullImageryDate, layerPeriod);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.jsindex 8904d2f72..fb941ec78 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@@ -18,7 +18,7 @@ export default async function fetchWMSImage(layer, date, extent, testMode) {version: '1.3.0',service: 'WMS',request: 'GetMap',- format: 'image/png',+ format: 'image/jpeg',STYLE: 'default',bbox,CRS: 'EPSG:3857',@@ -38,8 +38,8 @@ export default async function fetchWMSImage(layer, date, extent, testMode) {// Save the file for debugging purposes in test mode// This should open image in a seperate tab in the browser, may have to allow popupsif (testMode) {- const file = new Blob([response.data], { type: 'image/png' });- saveAs(file, `${layer}.png`);+ const file = new Blob([response.data], { type: 'image/jpeg' });+ saveAs(file, `${layer}.jpeg`);}return imageSrc;