Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

keep preloading beyond buffer when 'animating'

Jason Kenta0e52a22fcae
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 deb0616e2..7bd837496 100644
--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js
+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js
@@ -5,10 +5,9 @@ import HoverTooltip from '../../util/hover-tooltip';
import {
setArrowDown as setArrowDownAction,
setArrowUp as setArrowUpAction,
- setPreload as setPreloadAction,
} from '../../../modules/date/actions';
-const ANIMATION_DELAY = 300; // interval firing to trigger parent level arrow change
+const ANIMATION_DELAY = 500; // interval firing to trigger parent level arrow change
const CLICK_HOLD_DELAY = 300; // wait before click is considered a hold
let mouseHoldCheckTimer = null;
@@ -59,13 +58,13 @@ class DateChangeArrows extends PureComponent {
}
arrowUp = (direction) => {
- const { setArrowUp } = this.props;
+ const { setArrowUp, arrowDown } = this.props;
if (mouseHoldCheckTimer) {
clearTimeout(mouseHoldCheckTimer);
}
clearInterval(intervals[direction]);
this.arrowUpMap[direction]();
- setArrowUp();
+ if (arrowDown) setArrowUp();
}
render() {
@@ -170,9 +169,6 @@ const mapDispatchToProps = (dispatch) => ({
setArrowUp: () => {
dispatch(setArrowUpAction());
},
- setPreload: (bool) => {
- dispatch(setPreloadAction(bool));
- },
});
DateChangeArrows.propTypes = {
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index 1fb0b67c9..a0566b10b 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -861,11 +861,28 @@ export default function mapui(models, config, store, ui) {
*/
async function preloadNextTiles(date, compareString) {
const state = store.getState();
+ const { lastPreloadDate, preloaded, arrowDown } = state.date;
const { activeString } = state.compare;
const useActiveString = compareString || activeString;
- const useDate = date || getSelectedDate(state);
+ const useDate = date || lastPreloadDate || getSelectedDate(state);
const nextDate = getNextDateTime(state, 1, useDate);
const prevDate = getNextDateTime(state, -1, useDate);
+
+ // If we've preloaded N dates out, we need to use the latest
+ // preloaded date the next time we call this function or the buffer
+ // won't stay ahead of the 'animation' when holding down timetep arrows
+ if (preloaded && arrowDown) {
+ const subsequentDate = arrowDown === 'right' ? nextDate : prevDate;
+ console.log('preload step:', subsequentDate.toISOString());
+ store.dispatch({
+ type: dateConstants.SET_PRELOAD,
+ preloaded: true,
+ lastPreloadDate: subsequentDate,
+ });
+ await promiseImageryForTime(state, subsequentDate, useActiveString);
+ return;
+ }
+
await promiseImageryForTime(state, nextDate, useActiveString);
await promiseImageryForTime(state, prevDate, useActiveString);
if (!date) {
@@ -892,15 +909,18 @@ export default function mapui(models, config, store, ui) {
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);
+ console.log(nextDate.toISOString());
+ if (step !== BUFFER_SIZE) {
+ nextDate = getNextDateTime(state, direction, nextDate);
+ }
}
await Promise.all(preloadPromises);
store.dispatch({
type: dateConstants.SET_PRELOAD,
- value: true,
+ preloaded: true,
+ lastPreloadDate: nextDate,
});
}
diff --git a/web/js/modules/date/actions.js b/web/js/modules/date/actions.js
index 3eefe9223..b6e3d471c 100644
--- a/web/js/modules/date/actions.js
+++ b/web/js/modules/date/actions.js
@@ -105,9 +105,10 @@ export function setArrowUp () {
type: ARROW_UP,
};
}
-export function setPreload (value) {
+export function setPreload (preloaded, lastPreloadDate) {
return {
type: SET_PRELOAD,
- value,
+ preloaded,
+ lastPreloadDate,
};
}
diff --git a/web/js/modules/date/reducers.js b/web/js/modules/date/reducers.js
index 840a39e38..ff83ae8d0 100644
--- a/web/js/modules/date/reducers.js
+++ b/web/js/modules/date/reducers.js
@@ -16,6 +16,7 @@ import util from '../../util/util';
export const dateReducerState = {
arrowDown: false,
preloaded: false,
+ lastPreloadDate: undefined,
selectedZoom: 3,
interval: 3,
delta: 1,
@@ -77,11 +78,13 @@ export function dateReducer(state = dateReducerState, action) {
return {
...state,
arrowDown: false,
+ lastPreloadDate: undefined,
};
case SET_PRELOAD:
return {
...state,
- preloaded: action.value,
+ preloaded: action.preloaded,
+ lastPreloadDate: action.lastPreloadDate,
};
case TOGGLE_CUSTOM_MODAL: {
const timelineToggle = action.toggleBy === customModalType.TIMELINE;