Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

wait for preload to finish before 'animating'

Jason Kentb2724a6f3447
diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.js
index b60feee39..deb0616e2 100644
--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js
+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js
@@ -5,13 +5,13 @@ import HoverTooltip from '../../util/hover-tooltip';
import {
setArrowDown as setArrowDownAction,
setArrowUp as setArrowUpAction,
+ setPreload as setPreloadAction,
} from '../../../modules/date/actions';
-const ANIMATION_DELAY = 500; // interval firing to trigger parent level arrow change
-const CLICK_HOLD_DELAY = 500; // wait before click is considered a hold
+const ANIMATION_DELAY = 300; // interval firing to trigger parent level arrow change
+const CLICK_HOLD_DELAY = 300; // wait before click is considered a hold
let mouseHoldCheckTimer = null;
-let isMouseHolding = false;
// left/right arrow intervals
const intervals = {
left: 0,
@@ -21,18 +21,25 @@ 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,
};
}
+ componentDidUpdate (prevProps) {
+ const { tilesPreloaded, arrowDown } = this.props;
+ const finishedPreload = !prevProps.tilesPreloaded && tilesPreloaded;
+ if (finishedPreload && arrowDown) {
+ // set interval for holding arrow down
+ intervals[arrowDown] = setInterval(this.arrowDownMap[arrowDown], ANIMATION_DELAY);
+ }
+ }
+
componentWillUnmount() {
clearInterval(intervals.left);
clearInterval(intervals.right);
@@ -42,9 +49,6 @@ class DateChangeArrows extends PureComponent {
const { setArrowDown } = this.props;
setArrowDown(direction);
mouseHoldCheckTimer = null;
- isMouseHolding = true;
- // set interval for holding arrow down
- intervals[direction] = setInterval(this.arrowDownMap[direction], ANIMATION_DELAY);
}
arrowDown = (direction) => {
@@ -58,8 +62,6 @@ class DateChangeArrows extends PureComponent {
const { setArrowUp } = this.props;
if (mouseHoldCheckTimer) {
clearTimeout(mouseHoldCheckTimer);
- } else if (isMouseHolding) {
- isMouseHolding = false;
}
clearInterval(intervals[direction]);
this.arrowUpMap[direction]();
@@ -153,7 +155,13 @@ class DateChangeArrows extends PureComponent {
}
}
-const mapStateToProps = () => ({});
+const mapStateToProps = (state) => {
+ const { date } = state;
+ return {
+ tilesPreloaded: date.preloaded,
+ arrowDown: date.arrowDown,
+ };
+};
const mapDispatchToProps = (dispatch) => ({
setArrowDown: (isDownDirection) => {
@@ -162,10 +170,14 @@ const mapDispatchToProps = (dispatch) => ({
setArrowUp: () => {
dispatch(setArrowUpAction());
},
+ setPreload: (bool) => {
+ dispatch(setPreloadAction(bool));
+ },
});
DateChangeArrows.propTypes = {
handleSelectNowButton: PropTypes.func,
+ arrowDown: PropTypes.string,
leftArrowDisabled: PropTypes.bool,
leftArrowDown: PropTypes.func,
leftArrowUp: PropTypes.func,
@@ -176,6 +188,7 @@ DateChangeArrows.propTypes = {
rightArrowUp: PropTypes.func,
setArrowDown: PropTypes.func,
setArrowUp: PropTypes.func,
+ tilesPreloaded: PropTypes.bool,
};
export default connect(mapStateToProps, mapDispatchToProps)(DateChangeArrows);
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index 62534ba15..1fb0b67c9 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -897,6 +897,11 @@ export default function mapui(models, config, store, ui) {
nextDate = getNextDateTime(state, direction, nextDate);
}
await Promise.all(preloadPromises);
+
+ store.dispatch({
+ type: dateConstants.SET_PRELOAD,
+ value: true,
+ });
}
/*
diff --git a/web/js/modules/date/actions.js b/web/js/modules/date/actions.js
index 92dd1b3b6..3eefe9223 100644
--- a/web/js/modules/date/actions.js
+++ b/web/js/modules/date/actions.js
@@ -8,6 +8,7 @@ import {
INIT_SECOND_DATE,
ARROW_DOWN,
ARROW_UP,
+ SET_PRELOAD,
} from './constants';
import { getSelectedDate } from './selectors';
import { getMaxActiveLayersDate } from './util';
@@ -104,3 +105,9 @@ export function setArrowUp () {
type: ARROW_UP,
};
}
+export function setPreload (value) {
+ return {
+ type: SET_PRELOAD,
+ value,
+ };
+}
diff --git a/web/js/modules/date/constants.js b/web/js/modules/date/constants.js
index c85c054ac..6b59eefd4 100644
--- a/web/js/modules/date/constants.js
+++ b/web/js/modules/date/constants.js
@@ -7,6 +7,7 @@ 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 SET_PRELOAD = 'DATE/SET_PRELOAD';
export const monthMap = {
1: 'Jan',
diff --git a/web/js/modules/date/reducers.js b/web/js/modules/date/reducers.js
index 1acb5f3e9..840a39e38 100644
--- a/web/js/modules/date/reducers.js
+++ b/web/js/modules/date/reducers.js
@@ -9,11 +9,13 @@ import {
INIT_SECOND_DATE,
ARROW_DOWN,
ARROW_UP,
+ SET_PRELOAD,
} from './constants';
import util from '../../util/util';
export const dateReducerState = {
arrowDown: false,
+ preloaded: false,
selectedZoom: 3,
interval: 3,
delta: 1,
@@ -69,12 +71,18 @@ export function dateReducer(state = dateReducerState, action) {
return {
...state,
arrowDown: action.value,
+ preloaded: false,
};
case ARROW_UP:
return {
...state,
arrowDown: false,
};
+ case SET_PRELOAD:
+ return {
+ ...state,
+ preloaded: action.value,
+ };
case TOGGLE_CUSTOM_MODAL: {
const timelineToggle = action.toggleBy === customModalType.TIMELINE;
const animationToggle = action.toggleBy === customModalType.ANIMATION;