Interactive interface for browsing global, full-resolution satellite imagery
handle now test param and future layers
Ed Platod5e40025e5e7
diff --git a/e2e/features/timeline/date-selector-test.js b/e2e/features/timeline/date-selector-test.jsindex a962cdbd2..a070b5e78 100644--- a/e2e/features/timeline/date-selector-test.js+++ b/e2e/features/timeline/date-selector-test.js@@ -60,7 +60,7 @@ module.exports = {c.assert.cssClassPresent('#right-arrow-group', 'button-disabled');},- // verify default not button disabled+ // verify default now button disabled'Now button will be disabled by default': (c) => {reuseables.loadAndSkipTour(c, TIME_LIMIT);c.assert.cssClassPresent('#now-button-group', 'button-disabled');@@ -73,7 +73,7 @@ module.exports = {},// verify now button enabled since NOT loaded on current day- 'Now button will not be disabled': (c) => {+ 'Now button will not be disabled if date is not on now': (c) => {c.url(c.globals.url + knownDate);c.assert.not.cssClassPresent('#now-button-group', 'button-disabled');},diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 29bacbffb..39c751bf1 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -47,6 +47,7 @@ import {triggerTodayButton,} from '../../modules/date/actions';import {+ checkHasFutureLayers,filterProjLayersWithStartDate,} from '../../modules/date/util';import { toggleActiveCompareState } from '../../modules/compare/actions';@@ -172,14 +173,18 @@ class Timeline extends React.Component {}componentDidMount() {+ const { nowOverride } = this.props;document.addEventListener('keydown', this.handleKeyDown);document.addEventListener('keyup', this.handleKeyUp);// prevent default react synthetic event passive event listener// that allows browser resize/zoom on certain wheel eventsdocument.querySelector('.timeline-container').addEventListener('wheel', preventDefaultFunc, { passive: false });- this.checkAndUpdateAppNow = this.checkAndUpdateAppNow.bind(this);- this.appNowUpdateInterval = setInterval(this.checkAndUpdateAppNow, 60000 * 15);+ // appNow will not update if set in query string using 'now' parameter+ if (!nowOverride) {+ this.checkAndUpdateAppNow = this.checkAndUpdateAppNow.bind(this);+ this.appNowUpdateInterval = setInterval(this.checkAndUpdateAppNow, 60000 * 15);+ }this.setInitialState();}@@ -897,7 +902,9 @@ class Timeline extends React.Component {* then update appNow to current time.*/checkAndUpdateAppNow() {- const { updateAppNow } = this.props;+ const {+ updateAppNow,+ } = this.props;const self = this;const ensureCanUpdate = function() {return new Promise((resolve, reject) => {@@ -1425,15 +1432,7 @@ function mapStateToProps(state) {: hasSubDaily(activeLayers);// if future layers are included, timeline axis end date will extend past appNow- let hasFutureLayers;- if (isCompareModeActive) {- const compareALayersFiltered = filterProjLayersWithStartDate(layers.active.layers, proj.id);- const compareBLayersFiltered = filterProjLayersWithStartDate(layers.activeB.layers, proj.id);- hasFutureLayers = [...compareALayersFiltered, ...compareBLayersFiltered].filter((layer) => layer.futureTime).length > 0;- } else {- hasFutureLayers = activeLayersFiltered.filter((layer) => layer.futureTime).length > 0;- }-+ const hasFutureLayers = checkHasFutureLayers(state);let timelineEndDateLimit;if (hasFutureLayers) {timelineEndDateLimit = getTimelineEndDateLimit(state);@@ -1457,6 +1456,7 @@ function mapStateToProps(state) {}}+ const nowOverride = !!config.parameters.now;const dimensionsAndOffsetValues = getOffsetValues(screenWidth,hasSubdailyLayers,@@ -1482,6 +1482,9 @@ function mapStateToProps(state) {const nowButtonDisabled = checkNowButtonDisabled(selectedDate,timelineEndDateLimit,+ hasFutureLayers,+ nowOverride,+ appNow,);return {appNow,@@ -1508,6 +1511,7 @@ function mapStateToProps(state) {customIntervalValue: customDelta || 1,customIntervalZoomLevel: updatedCustomInterval || 3,deltaChangeAmt,+ nowOverride,parentOffset: dimensionsAndOffsetValues.parentOffset,timelineEndDateLimit,leftArrowDisabled,@@ -1617,6 +1621,7 @@ Timeline.propTypes = {isTourActive: PropTypes.bool,leftArrowDisabled: PropTypes.bool,nowButtonDisabled: PropTypes.bool,+ nowOverride: PropTypes.bool,onUpdateEndDate: PropTypes.func,onUpdateStartAndEndDate: PropTypes.func,onUpdateStartDate: PropTypes.func,@@ -1726,9 +1731,17 @@ const checkRightArrowDisabled = (const checkNowButtonDisabled = (date,timelineEndDateLimit,+ hasFutureLayers,+ nowOverride,+ appNow,) => {const dateTimeMoment = new Date(moment.utc(date).seconds(0).format());- const maxDateMoment = new Date(moment.utc(timelineEndDateLimit).seconds(0).format());+ let maxDateMoment;+ if (nowOverride || hasFutureLayers) {+ maxDateMoment = new Date(moment.utc(appNow).seconds(0).format());+ } else {+ maxDateMoment = new Date(moment.utc(timelineEndDateLimit).seconds(0).format());+ }return dateTimeMoment.getTime() === maxDateMoment.getTime();};diff --git a/web/js/modules/date/actions.js b/web/js/modules/date/actions.jsindex 44d0d42fc..86ad0dcf6 100644--- a/web/js/modules/date/actions.js+++ b/web/js/modules/date/actions.js@@ -23,7 +23,7 @@ export function triggerTodayButton() {const selectedDateTime = selectedDate.getTime();const appNowTime = appNow.getTime();- if (selectedDateTime < appNowTime) {+ if (selectedDateTime !== appNowTime) {dispatch({type: SELECT_DATE,activeString,diff --git a/web/js/modules/date/util.js b/web/js/modules/date/util.jsindex 430e47166..e70f2eeb7 100644--- a/web/js/modules/date/util.js+++ b/web/js/modules/date/util.js@@ -148,6 +148,28 @@ export function getMaxActiveLayersDate(state) {return maxDate;}+/**+ * Checks if future time layer is within included layers+ *+ * @method checkHasFutureLayers+ * @param {Object} state+ * @returns {Boolean} hasFutureLayers+ */+export function checkHasFutureLayers(state) {+ const { compare, proj, layers } = state;+ let hasFutureLayers;+ if (compare.active) {+ const compareALayersFiltered = filterProjLayersWithStartDate(layers.active.layers, proj.id);+ const compareBLayersFiltered = filterProjLayersWithStartDate(layers.activeB.layers, proj.id);+ hasFutureLayers = [...compareALayersFiltered, ...compareBLayersFiltered].filter((layer) => layer.futureTime).length > 0;+ } else {+ const activeLayers = getActiveLayers(state);+ const activeLayersFiltered = filterProjLayersWithStartDate(activeLayers, proj.id);+ hasFutureLayers = activeLayersFiltered.filter((layer) => layer.futureTime).length > 0;+ }+ return hasFutureLayers;+}+/*** Checks the date provided against the active layers.*