Interactive interface for browsing global, full-resolution satellite imagery
basic preloading on click and hold
Jason Kenta4b7f5085408
diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.jsindex 505a67693..b60feee39 100644--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js@@ -1,9 +1,14 @@import React, { PureComponent } from 'react';import PropTypes from 'prop-types';+import { connect } from 'react-redux';import HoverTooltip from '../../util/hover-tooltip';+import {+ setArrowDown as setArrowDownAction,+ setArrowUp as setArrowUpAction,+} from '../../../modules/date/actions';-const ANIMATION_DELAY = 200; // interval firing to trigger parent level arrow change-const CLICK_TIMEOUT_DELAY = 500; // wait before click becomes a delay+const ANIMATION_DELAY = 500; // interval firing to trigger parent level arrow change+const CLICK_HOLD_DELAY = 500; // wait before click is considered a holdlet mouseHoldCheckTimer = null;let isMouseHolding = false;@@ -14,69 +19,51 @@ const intervals = {};class DateChangeArrows extends PureComponent {+ constructor(props) {+ super(props);++ this.arrowDownMap = {+ left: props.leftArrowDown,+ right: props.rightArrowDown,+ };++ this.arrowUpMap = {+ left: props.leftArrowUp,+ right: props.rightArrowUp,+ };+ }+componentWillUnmount() {clearInterval(intervals.left);clearInterval(intervals.right);}- /**- * @desc repeatedly call while mouse down - decrement date- * @returns {void}- */- leftArrowDown = () => {- const { leftArrowDown } = this.props;- leftArrowDown();- mouseHoldCheckTimer = setTimeout(() => {- mouseHoldCheckTimer = null;- isMouseHolding = true;- // set interval for holding arrow down- intervals.left = setInterval(leftArrowDown, ANIMATION_DELAY);- }, CLICK_TIMEOUT_DELAY);+ clickAndHold = (direction) => {+ const { setArrowDown } = this.props;+ setArrowDown(direction);+ mouseHoldCheckTimer = null;+ isMouseHolding = true;+ // set interval for holding arrow down+ intervals[direction] = setInterval(this.arrowDownMap[direction], ANIMATION_DELAY);}- /**- * @desc repeatedly call while mouse down - decrement date- * @returns {void}- */- rightArrowDown = () => {- const { rightArrowDown } = this.props;- rightArrowDown();+ arrowDown = (direction) => {+ this.arrowDownMap[direction]();mouseHoldCheckTimer = setTimeout(() => {- mouseHoldCheckTimer = null;- isMouseHolding = true;- // set interval for holding arrow down- intervals.right = setInterval(rightArrowDown, ANIMATION_DELAY);- }, CLICK_TIMEOUT_DELAY);- }-- /**- * @desc stop animation from left arrow - clear timeout invocation- * @returns {void}- */- leftArrowUp = () => {- const { leftArrowUp } = this.props;- if (mouseHoldCheckTimer) {- clearTimeout(mouseHoldCheckTimer);- } else if (isMouseHolding) {- isMouseHolding = false;- }- clearInterval(intervals.left);- leftArrowUp();+ this.clickAndHold(direction);+ }, CLICK_HOLD_DELAY);}- /**- * @desc stop animation from right arrow - clear timeout invocation- * @returns {void}- */- rightArrowUp = () => {- const { rightArrowUp } = this.props;+ arrowUp = (direction) => {+ const { setArrowUp } = this.props;if (mouseHoldCheckTimer) {clearTimeout(mouseHoldCheckTimer);} else if (isMouseHolding) {isMouseHolding = false;}- clearInterval(intervals.right);- rightArrowUp();+ clearInterval(intervals[direction]);+ this.arrowUpMap[direction]();+ setArrowUp();}render() {@@ -87,15 +74,21 @@ class DateChangeArrows extends PureComponent {nowButtonDisabled,rightArrowDisabled,} = this.props;++ const leftArrowDown = () => this.arrowDown('left');+ const rightArrowDown = () => this.arrowDown('right');+ const leftArrowUp = () => this.arrowUp('left');+ const rightArrowUp = () => this.arrowUp('right');+return (<div>{/* LEFT ARROW */}<divclassName={`button-action-group${leftArrowDisabled ? ' button-disabled' : ''}`}id="left-arrow-group"- onMouseDown={this.leftArrowDown}- onMouseUp={this.leftArrowUp}- onMouseLeave={this.leftArrowUp}+ onMouseDown={leftArrowDown}+ onMouseUp={leftArrowUp}+ onMouseLeave={leftArrowUp}aria-disabled={leftArrowDisabled}><HoverTooltip@@ -116,9 +109,9 @@ class DateChangeArrows extends PureComponent {<divclassName={`button-action-group${rightArrowDisabled ? ' button-disabled' : ''}`}id="right-arrow-group"- onMouseDown={this.rightArrowDown}- onMouseUp={this.rightArrowUp}- onMouseLeave={this.rightArrowUp}+ onMouseDown={rightArrowDown}+ onMouseUp={rightArrowUp}+ onMouseLeave={rightArrowUp}aria-disabled={rightArrowDisabled}><HoverTooltip@@ -160,6 +153,17 @@ class DateChangeArrows extends PureComponent {}}+const mapStateToProps = () => ({});++const mapDispatchToProps = (dispatch) => ({+ setArrowDown: (isDownDirection) => {+ dispatch(setArrowDownAction(isDownDirection));+ },+ setArrowUp: () => {+ dispatch(setArrowUpAction());+ },+});+DateChangeArrows.propTypes = {handleSelectNowButton: PropTypes.func,leftArrowDisabled: PropTypes.bool,@@ -170,6 +174,8 @@ DateChangeArrows.propTypes = {rightArrowDisabled: PropTypes.bool,rightArrowDown: PropTypes.func,rightArrowUp: PropTypes.func,+ setArrowDown: PropTypes.func,+ setArrowUp: PropTypes.func,};-export default DateChangeArrows;+export default connect(mapStateToProps, mapDispatchToProps)(DateChangeArrows);diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 2193ad1d2..f75b2562b 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -98,8 +98,6 @@ class Timeline extends React.Component {showHoverLine: false,showDraggerTime: false,isAnimationDraggerDragging: false,- // eslint-disable-next-line react/no-unused-state- isArrowDown: false,isDraggerDragging: false,isTimelineDragging: false,initialLoadComplete: false,@@ -493,8 +491,6 @@ class Timeline extends React.Component {const maxDate = new Date(timelineEndDateLimit);this.onDateChange(getNextTimeSelection(delta, timeScaleChangeUnit, selectedDate, minDate, maxDate));}- // eslint-disable-next-line react/no-unused-state- this.setState({ isArrowDown: true });}/**@@ -503,8 +499,6 @@ class Timeline extends React.Component {*/stopLeftArrow = () => {this.throttleDecrementDate.cancel();- // eslint-disable-next-line react/no-unused-state- this.setState({ isArrowDown: false });}/**@@ -513,8 +507,6 @@ class Timeline extends React.Component {*/stopRightArrow = () => {this.throttleIncrementDate.cancel();- // eslint-disable-next-line react/no-unused-state- this.setState({ isArrowDown: false });}/**@@ -895,13 +887,12 @@ class Timeline extends React.Component {return new Promise((resolve, reject) => {(function waitForSafeUpdate() {const {- isArrowDown,isTimelineDragging,isDraggerDragging,isAnimationDraggerDragging,} = self.state;- const { isAnimationPlaying } = self.props;- const userIsInteracting = isArrowDown || isTimelineDragging || isDraggerDragging || isAnimationDraggerDragging;+ const { isAnimationPlaying, arrowDown } = self.props;+ const userIsInteracting = arrowDown || isTimelineDragging || isDraggerDragging || isAnimationDraggerDragging;if (!userIsInteracting && !isAnimationPlaying) {return resolve();}diff --git a/web/js/map/ui.js b/web/js/map/ui.jsindex ffe0f93fa..62534ba15 100644--- a/web/js/map/ui.js+++ b/web/js/map/ui.js@@ -60,7 +60,7 @@ import {RENDERED, UPDATE_MAP_UI, UPDATE_MAP_EXTENT, UPDATE_MAP_ROTATION, FITTED_TO_LEADING_EXTENT, REFRESH_ROTATE, CLEAR_ROTATE,} from '../modules/map/constants';import { getLeadingExtent, promiseImageryForTime } from '../modules/map/util';-import { getNextTimeSelection } from '../modules/date/util';+import { getNextDateTime } from '../modules/date/util';import { updateVectorSelection } from '../modules/vector-styles/util';import { hasVectorLayers } from '../modules/layers/util';@@ -209,6 +209,9 @@ export default function mapui(models, config, store, ui) {updateDate().then(preloadNextTiles);break;}+ case dateConstants.ARROW_DOWN:+ bufferQuickAnimate(action.value);+ break;default:break;}@@ -858,19 +861,11 @@ export default function mapui(models, config, store, ui) {*/async function preloadNextTiles(date, compareString) {const state = store.getState();- const { timeScaleFromNumberKey } = dateConstants;const { activeString } = state.compare;- const {- customSelected, customDelta, delta, customInterval, interval,- } = state.date;const useActiveString = compareString || activeString;const useDate = date || getSelectedDate(state);- const useDelta = customSelected ? customDelta : delta;- const changeUnit = customSelected- ? timeScaleFromNumberKey[customInterval]- : timeScaleFromNumberKey[interval];- const nextDate = getNextTimeSelection(useDelta, changeUnit, useDate);- const prevDate = getNextTimeSelection(useDelta * -1, changeUnit, useDate);+ const nextDate = getNextDateTime(state, 1, useDate);+ const prevDate = getNextDateTime(state, -1, useDate);await promiseImageryForTime(state, nextDate, useActiveString);await promiseImageryForTime(state, prevDate, useActiveString);if (!date) {@@ -888,6 +883,22 @@ export default function mapui(models, config, store, ui) {}}+ async function bufferQuickAnimate(arrowDown) {+ const state = store.getState();+ const BUFFER_SIZE = 8;+ const preloadPromises = [];+ const currentDate = getSelectedDate(state);+ const direction = arrowDown === 'right' ? 1 : -1;+ let nextDate = getNextDateTime(state, direction, currentDate);++ for (let step = 1; step <= BUFFER_SIZE; step += 1) {+ console.log(nextDate.toISOString());+ preloadPromises.push(promiseImageryForTime(state, nextDate));+ nextDate = getNextDateTime(state, direction, nextDate);+ }+ await Promise.all(preloadPromises);+ }+/** Update layers for the correct Date*diff --git a/web/js/modules/date/actions.js b/web/js/modules/date/actions.jsindex 86ad0dcf6..92dd1b3b6 100644--- a/web/js/modules/date/actions.js+++ b/web/js/modules/date/actions.js@@ -6,6 +6,8 @@ import {UPDATE_APP_NOW,TOGGLE_CUSTOM_MODAL,INIT_SECOND_DATE,+ ARROW_DOWN,+ ARROW_UP,} from './constants';import { getSelectedDate } from './selectors';import { getMaxActiveLayersDate } from './util';@@ -91,3 +93,14 @@ export function toggleCustomModal(open, toggleBy) {toggleBy,};}+export function setArrowDown (value) {+ return {+ type: ARROW_DOWN,+ value,+ };+}+export function setArrowUp () {+ return {+ type: ARROW_UP,+ };+}diff --git a/web/js/modules/date/constants.js b/web/js/modules/date/constants.jsindex 04e2903a8..c85c054ac 100644--- a/web/js/modules/date/constants.js+++ b/web/js/modules/date/constants.js@@ -5,6 +5,8 @@ export const SELECT_DATE = 'DATE/SELECT_DATE';export const UPDATE_APP_NOW = 'DATE/UPDATE_APP_NOW';export const TOGGLE_CUSTOM_MODAL = 'DATE/TOGGLE_CUSTOM_MODAL';export const INIT_SECOND_DATE = 'DATE/INIT_SECOND_DATE';+export const ARROW_DOWN = 'DATE/ARROW_DOWN';+export const ARROW_UP = 'DATE/ARROW_UP';export const monthMap = {1: 'Jan',diff --git a/web/js/modules/date/reducers.js b/web/js/modules/date/reducers.jsindex 3c01f4f1b..1acb5f3e9 100644--- a/web/js/modules/date/reducers.js+++ b/web/js/modules/date/reducers.js@@ -1,4 +1,3 @@-import { assign as lodashAssign } from 'lodash';import {CHANGE_TIME_SCALE,CHANGE_CUSTOM_INTERVAL,@@ -8,10 +7,13 @@ import {TOGGLE_CUSTOM_MODAL,customModalType,INIT_SECOND_DATE,+ ARROW_DOWN,+ ARROW_UP,} from './constants';import util from '../../util/util';export const dateReducerState = {+ arrowDown: false,selectedZoom: 3,interval: 3,delta: 1,@@ -24,51 +26,69 @@ export const dateReducerState = {};export function getInitialState(config) {- return lodashAssign({}, dateReducerState, {+ return {+ ...dateReducerState,selected: config.initialDate,selectedB: util.dateAdd(config.initialDate, 'day', -7),appNow: config.pageLoadTime,- });+ };}export function dateReducer(state = dateReducerState, action) {switch (action.type) {case CHANGE_TIME_SCALE:- return lodashAssign({}, state, {+ return {+ ...state,selectedZoom: action.value,- });+ };case INIT_SECOND_DATE:- return lodashAssign({}, state, {+ return {+ ...state,selectedB: util.dateAdd(state.selected, 'day', -7),- });+ };case CHANGE_CUSTOM_INTERVAL:- return lodashAssign({}, state, {+ return {+ ...state,customInterval: action.value,customDelta: action.delta,customSelected: true,- });+ };case CHANGE_INTERVAL:- return lodashAssign({}, state, {+ return {+ ...state,interval: action.value,delta: action.delta,customSelected: action.customSelected,- });+ };case SELECT_DATE:- return lodashAssign({}, state, {+ return {+ ...state,[action.activeString]: action.value,- });+ };+ case ARROW_DOWN:+ return {+ ...state,+ arrowDown: action.value,+ };+ case ARROW_UP:+ return {+ ...state,+ arrowDown: false,+ };case TOGGLE_CUSTOM_MODAL: {const timelineToggle = action.toggleBy === customModalType.TIMELINE;const animationToggle = action.toggleBy === customModalType.ANIMATION;- return lodashAssign({}, state, {+ return {+ ...state,timelineCustomModalOpen: animationToggle ? false : action.value,animationCustomModalOpen: timelineToggle ? false : action.value,- });+ };}case UPDATE_APP_NOW:- return lodashAssign({}, state, {+ return {+ ...state,appNow: action.value,- });+ };default:return state;}diff --git a/web/js/modules/date/util.js b/web/js/modules/date/util.jsindex b74e090c6..4ed9a4d46 100644--- a/web/js/modules/date/util.js+++ b/web/js/modules/date/util.js@@ -5,6 +5,8 @@ import { layersParse12 } from '../layers/util';import {dateRange as getDateRange, getActiveLayers,} from '../layers/selectors';+import { timeScaleFromNumberKey } from './constants';+import { getSelectedDate } from './selectors';export const filterProjLayersWithStartDate = (layers, projId) => layers.filter((layer) => layer.startDate && layer.projections[projId]);@@ -278,3 +280,15 @@ export const getNextTimeSelection = (delta, increment, prevDate, minDate, maxDat}return date;};++export const getNextDateTime = (state, direction, date) => {+ const {+ customSelected, customDelta, delta, customInterval, interval,+ } = state.date;+ const useDate = date || getSelectedDate(state);+ const useDelta = customSelected ? customDelta : delta;+ const changeUnit = customSelected+ ? timeScaleFromNumberKey[customInterval]+ : timeScaleFromNumberKey[interval];+ return getNextTimeSelection(useDelta * direction, changeUnit, useDate);+};