Interactive interface for browsing global, full-resolution satellite imagery
preload tweaks
Jason Kentc3d2d5433aea
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 4db9b10ef..2cf58ecbc 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -37,6 +37,7 @@ import {hasSubDaily,getActiveLayers,} from '../../modules/layers/selectors';+import { getSelectedDate, getDeltaIntervalUnit } from '../../modules/date/selectors';import {selectDate as selectDateAction,changeTimeScale,@@ -1323,8 +1324,6 @@ function mapStateToProps(state) {customDelta,customInterval,customSelected,- delta,- interval,selected,selectedB,selectedZoom,@@ -1355,17 +1354,17 @@ function mapStateToProps(state) {timelineEndDateLimit = getISODateFormatted(appNow);}- let updatedInterval = interval;+ const selectedDate = getSelectedDate(state);+ const { delta, unit } = getDeltaIntervalUnit(state);+let updatedCustomInterval = customInterval;let updatedSelectedZoom = selectedZoom;+// handle reset of timescale and intervals if not subdailyif (!hasSubdailyLayers) {if (selectedZoom > 3) {updatedSelectedZoom = 3;}- if (interval > 3) {- updatedInterval = 3;- }if (customInterval > 3) {updatedCustomInterval = 3;}@@ -1376,22 +1375,18 @@ function mapStateToProps(state) {screenWidth,hasSubdailyLayers,);- const selectedDate = isCompareA ? selected : selectedB;- const deltaChangeAmt = customSelected ? customDelta : delta;- const timeScaleChangeUnit = customSelected- ? timeScaleFromNumberKey[updatedCustomInterval]- : timeScaleFromNumberKey[updatedInterval];+const timelineStartDateLimit = config.startDate;const leftArrowDisabled = checkLeftArrowDisabled(selectedDate,- deltaChangeAmt,- timeScaleChangeUnit,+ delta,+ unit,timelineStartDateLimit,);const rightArrowDisabled = checkRightArrowDisabled(selectedDate,- deltaChangeAmt,- timeScaleChangeUnit,+ delta,+ unit,timelineEndDateLimit,);const nowButtonDisabled = checkNowButtonDisabled(@@ -1422,11 +1417,11 @@ function mapStateToProps(state) {axisWidth: dimensionsAndOffsetValues.width,selectedDate,timeScale: timeScaleFromNumberKey[updatedSelectedZoom.toString()],- timeScaleChangeUnit,+ timeScaleChangeUnit: unit,customIntervalValue: customDelta || 1,customIntervalZoomLevel: updatedCustomInterval || 3,- deltaChangeAmt,nowOverride,+ deltaChangeAmt: delta,parentOffset: dimensionsAndOffsetValues.parentOffset,timelineEndDateLimit,leftArrowDisabled,diff --git a/web/js/map/ui.js b/web/js/map/ui.jsindex 0a3d652b5..5851790a7 100644--- a/web/js/map/ui.js+++ b/web/js/map/ui.js@@ -54,13 +54,12 @@ import {getAllActiveLayers,} from '../modules/layers/selectors';import { getSelectedDate } from '../modules/date/selectors';+import { getNumberStepsBetween, getNextDateTime } from '../modules/date/util';import { EXIT_ANIMATION, STOP_ANIMATION } from '../modules/animation/constants';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 { getNextDateTime } from '../modules/date/util';-import { updateVectorSelection } from '../modules/vector-styles/util';import { hasVectorLayers } from '../modules/layers/util';import { animateCoordinates, getCoordinatesMarker } from '../modules/location-search/util';@@ -680,6 +679,7 @@ export default function mapui(models, config, store, ui) {}});}+/** Sets new opacity to layer*@@ -893,12 +893,20 @@ export default function mapui(models, config, store, ui) {}}+async function bufferQuickAnimate(arrowDown) {- const state = store.getState();- const { preloaded, lastPreloadDate } = state.date;const BUFFER_SIZE = 8;const preloadPromises = [];- const currentDate = preloaded ? lastPreloadDate : getSelectedDate(state);+ const state = store.getState();+ const { preloaded, lastPreloadDate } = state.date;+ const selectedDate = getSelectedDate(state);+ const currentBuffer = preloaded ? getNumberStepsBetween(state, selectedDate, lastPreloadDate) : 0;++ if (currentBuffer >= BUFFER_SIZE) {+ return;+ }++ const currentDate = preloaded ? lastPreloadDate : selectedDate;const direction = arrowDown === 'right' ? 1 : -1;let nextDate = getNextDateTime(state, direction, currentDate);@@ -992,14 +1000,13 @@ export default function mapui(models, config, store, ui) {}const updateExtent = () => {- const view = self.selected.getView();- const extent = view.calculateExtent(self.selected.getSize());+ const map = self.selected;+ const view = map.getView();+ const extent = view.calculateExtent(map.getSize());store.dispatch({ type: UPDATE_MAP_EXTENT, extent });- lodashThrottle(- () => events.trigger('map:extent'),- 500,- { trailing: true },- )();+ if (map.isRendered()) {+ store.dispatch({ type: dateConstants.CLEAR_PRELOAD });+ }};/*diff --git a/web/js/modules/date/selectors.js b/web/js/modules/date/selectors.jsindex f6a043008..562417a16 100644--- a/web/js/modules/date/selectors.js+++ b/web/js/modules/date/selectors.js@@ -1,3 +1,5 @@+import { timeScaleFromNumberKey } from './constants';+export function getDates (state) {const { date } = state;const { selected, selectedB } = date;@@ -11,3 +13,18 @@ export function getSelectedDate (state, compareDateString) {}return date[compare.isCompareA ? 'selected' : 'selectedB'];}++export function getDeltaIntervalUnit (state) {+ const {+ customSelected, customDelta, delta, customInterval, interval,+ } = state.date;+ const useDelta = customSelected ? customDelta : delta;+ const useInterval = customSelected ? customInterval : interval;+ const changeUnit = timeScaleFromNumberKey[useInterval];++ return {+ delta: useDelta,+ interval: useInterval,+ unit: changeUnit,+ };+}diff --git a/web/js/modules/date/util.js b/web/js/modules/date/util.jsindex a41f16b0f..7d0f98c65 100644--- a/web/js/modules/date/util.js+++ b/web/js/modules/date/util.js@@ -1,12 +1,12 @@import { each as lodashEach, get } from 'lodash';import update from 'immutability-helper';+import moment from 'moment';import util from '../../util/util';import { layersParse12 } from '../layers/util';import {dateRange as getDateRange, getActiveLayers,} from '../layers/selectors';-import { timeScaleFromNumberKey } from './constants';-import { getSelectedDate } from './selectors';+import { getSelectedDate, getDeltaIntervalUnit } from './selectors';export const filterProjLayersWithStartDate = (layers, projId) => layers.filter((layer) => layer.startDate && layer.projections[projId]);@@ -281,20 +281,22 @@ export const getNextTimeSelection = (delta, increment, prevDate, minDate, maxDatreturn date;};+export function getNumberStepsBetween(state, start, end) {+ const { delta, unit } = getDeltaIntervalUnit(state);+ const a = moment(start);+ const b = moment(end);+ const diff = a.diff(b, unit);+ return diff / delta;+}+/*** Get the next date when using left/right arrows based on* current interval and delta*/export const getNextDateTime = (state, direction, date) => {- const {- customSelected, customDelta, delta, customInterval, interval,- } = state.date;+ const { delta, unit } = getDeltaIntervalUnit(state);const useDate = date || getSelectedDate(state);- const useDelta = customSelected ? customDelta : delta;- const changeUnit = customSelected- ? timeScaleFromNumberKey[customInterval]- : timeScaleFromNumberKey[interval];- return getNextTimeSelection(useDelta * direction, changeUnit, useDate);+ return getNextTimeSelection(delta * direction, unit, useDate);};/**