Skip to content

Commit

Permalink
Merge pull request #4406 from nasa-gibs/UAT-v4.7.0-2
Browse files Browse the repository at this point in the history
UAT-v4.7.0-2 to Release
  • Loading branch information
ryanweiler92 authored Jun 7, 2023
2 parents 7c969b7 + c0cc7bc commit 5627fa6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 3 additions & 1 deletion web/js/containers/animation-widget/animation-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ const mapStateToProps = (state) => {
const hasFutureLayers = activeLayersForProj.filter((layer) => layer.futureTime).length > 0;
const layerDateRange = getDateRange({}, activeLayersForProj);

const isAntarctic = proj.id === 'arctic';

const minDate = new Date(config.startDate);
let maxDate;
if (layerDateRange && layerDateRange.end > appNow) {
Expand All @@ -388,7 +390,7 @@ const mapStateToProps = (state) => {
const {
isDistractionFreeModeActive, isKioskModeActive, animationAvailabilityChecked, eic,
} = ui;
const checkAnimationAvailability = (eic === 'sa' || eic === 'da') && !animationAvailabilityChecked && isKioskModeActive && isPlaying;
const checkAnimationAvailability = (eic === 'sa' || eic === 'da') && !animationAvailabilityChecked && isKioskModeActive && isPlaying && !isAntarctic;
const { isEmbedModeActive } = embed;
const animationIsActive = isActive
&& lodashGet(map, 'ui.selected.frameState_')
Expand Down
7 changes: 2 additions & 5 deletions web/js/map/layerbuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
mergeBreakpointLayerAttributes,
formatReduxDate,
extractDateFromTileErrorURL,
formatSelectedDate,
} from './util';
import { datesInDateRanges, prevDateInDateRange } from '../modules/layers/util';
import { updateLayerDateCollection, updateLayerCollection } from '../modules/layers/actions';
Expand Down Expand Up @@ -163,14 +162,12 @@ export default function mapLayerBuilder(config, cache, store) {
*/
const tileLoadFunction = (layer, layerDate) => async function(tile, src) {
const state = store.getState();
const { ui: { isKioskModeActive }, date: { selected } } = state;
const { ui: { isKioskModeActive } } = state;

const date = layerDate.toISOString().split('T')[0];

const checkBlobTiles = (headers) => {
// recently changed from appNow date to selected date, was previously only checking current day
const formattedSelectedDate = formatSelectedDate(selected);
if (isKioskModeActive && kioskCheckForBlankTilesList.includes(layer.id) && formattedSelectedDate === date) {
if (isKioskModeActive && kioskCheckForBlankTilesList.includes(layer.id)) {
errorTiles.kioskTileCount += 1;
const contentLength = headers.get('content-length');
const contentType = headers.get('content-type');
Expand Down

0 comments on commit 5627fa6

Please sign in to comment.