Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2886 Tour Story Animation Caching (#4828)

christof-wittreich6cb3ee309bf5
diff --git a/web/js/components/animation-widget/play-queue.js b/web/js/components/animation-widget/play-queue.js
index 431b762dc..58eb50144 100644
--- a/web/js/components/animation-widget/play-queue.js
+++ b/web/js/components/animation-widget/play-queue.js
@@ -60,13 +60,22 @@ class PlayQueue extends React.Component {
this.minBufferLength = null;
this.canPreloadAll = numberOfFrames <= this.initialBufferSize;
this.abortController = null;
+ this.isBetweenSteps = false;
+ this.hasPlayStarted = false;
+ this.onPropertyChange = this.onPropertyChange.bind(this);
+ this.onMoveEnd = this.onMoveEnd.bind(this);
}
componentDidMount() {
+ const {
+ map,
+ } = this.props;
this.mounted = true;
// this.queue.on('completed', (dateStr) => {
// console.debug(dateStr, this.queue.size, this.queue.pending);
// });
+ map.ui.selected.getView().on('propertychange', this.onPropertyChange);
+ map.ui.selected.on('moveend', this.onMoveEnd);
this.playingDate = this.getStartDate();
this.checkQueue();
this.checkShouldPlay();
@@ -74,14 +83,30 @@ class PlayQueue extends React.Component {
}
componentWillUnmount() {
+ const {
+ map,
+ } = this.props;
this.mounted = false;
this.clearCache();
this.queue.clear();
+ map.ui.selected.getView().un('propertychange', this.onPropertyChange);
+ map.ui.selected.un('moveend', this.onMoveEnd);
if (this.abortController) {
this.abortController.abort();
}
}
+ onPropertyChange() {
+ if (this.isBetweenSteps) return;
+ this.isBetweenSteps = true;
+ }
+
+ onMoveEnd() {
+ if (!this.isBetweenSteps) return;
+ this.isBetweenSteps = false;
+ this.checkShouldPlay();
+ }
+
/**
* Create a frameDates array of each date to be played to be used in getPlaybackPosition()
*/
@@ -218,11 +243,13 @@ class PlayQueue extends React.Component {
const currentDate = toDate(this.playingDate);
const restartLoop = loopStart && currentDate.getTime() === startDate.getTime();
- if (isAnimating && !loopStart) {
+ if ((isAnimating || this.hasPlayStarted) && !loopStart) {
return;
}
if (this.isPreloadSufficient() || restartLoop) {
+ if (this.isBetweenSteps) return;
// console.debug('Started: ', Date.now());
+ this.hasPlayStarted = true;
return this.play();
}
this.checkQueue();
@@ -350,7 +377,8 @@ class PlayQueue extends React.Component {
stopPlaying() {
this.abortController.abort();
this.setState({ isAnimating: false });
- console.debug('Stopped', this.getAverageFetchTime(), this.fetchTimes);
+ this.hasPlayStarted = false;
+ // console.debug('Stopped', this.getAverageFetchTime(), this.fetchTimes);
}
animationInterval(ms, callback) {
@@ -483,6 +511,7 @@ PlayQueue.propTypes = {
numberOfFrames: PropTypes.number,
snappedCurrentDate: PropTypes.object,
isKioskModeActive: PropTypes.bool,
+ map: PropTypes.object,
};
export default PlayQueue;
diff --git a/web/js/containers/animation-widget/animation-widget.js b/web/js/containers/animation-widget/animation-widget.js
index 423e9c11a..b49c224c3 100644
--- a/web/js/containers/animation-widget/animation-widget.js
+++ b/web/js/containers/animation-widget/animation-widget.js
@@ -89,6 +89,7 @@ function AnimationWidget (props) {
snappedCurrentDate,
startDate,
subDailyMode,
+ map,
} = props;
const widgetWidth = 334;
@@ -247,6 +248,7 @@ function AnimationWidget (props) {
togglePlaying={onPushPause}
promiseImageryForTime={promiseImageryForTime}
onClose={onPushPause}
+ map={map}
/>
) : null
}
diff --git a/web/js/mapUI/components/update-projection/updateProjection.js b/web/js/mapUI/components/update-projection/updateProjection.js
index 4389d6d49..0891a342f 100644
--- a/web/js/mapUI/components/update-projection/updateProjection.js
+++ b/web/js/mapUI/components/update-projection/updateProjection.js
@@ -69,7 +69,6 @@ function UpdateProjection(props) {
lodashEach(activeLayersUI, (mapLayer) => {
ui.selected.removeLayer(mapLayer);
});
- ui.cache.clear();
};
/**
diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.js
index 6701c1fd9..428d2c59f 100644
--- a/web/js/modules/layers/selectors.js
+++ b/web/js/modules/layers/selectors.js
@@ -168,7 +168,7 @@ export const getActiveLayerGroup = (state) => {
? layerGroups[0]
: layerGroups[1].get('group') === activeString
? layerGroups[1]
- : null;
+ : map.ui.selected;
}
}
return map.ui.selected;