Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Revert "remove init second date logic and update test"

Ed Platofc6e2cdafe73
diff --git a/web/js/modules/compare/actions.js b/web/js/modules/compare/actions.js
index c889249c3..0154d630c 100644
--- a/web/js/modules/compare/actions.js
+++ b/web/js/modules/compare/actions.js
@@ -1,5 +1,5 @@
import { initSecondLayerGroup } from '../layers/actions';
-import { clearPreload } from '../date/actions';
+import { initSecondDate, clearPreload } from '../date/actions';
import {
CHANGE_STATE,
TOGGLE_ON_OFF,
@@ -17,6 +17,7 @@ export function toggleCompareOnOff() {
return (dispatch, getState) => {
if (!getState().compare.bStatesInitiated) {
dispatch(initSecondLayerGroup());
+ dispatch(initSecondDate());
}
dispatch({ type: TOGGLE_ON_OFF });
};
diff --git a/web/js/modules/compare/actions.test.js b/web/js/modules/compare/actions.test.js
index 0620fd2e8..921c83152 100644
--- a/web/js/modules/compare/actions.test.js
+++ b/web/js/modules/compare/actions.test.js
@@ -9,20 +9,22 @@ import {
} from './actions';
import { INIT_SECOND_LAYER_GROUP } from '../layers/constants';
import fixtures from '../../fixtures';
-import { CLEAR_PRELOAD } from '../date/constants';
+import { INIT_SECOND_DATE, CLEAR_PRELOAD } from '../date/constants';
const middlewares = [thunk];
const state = fixtures.getState();
-test('toggleCompareOnOff dispatches one action', () => {
+test('toggleCompareOnOff dispactches two actions', () => {
const mockStore = configureMockStore(middlewares);
const store = mockStore(state);
store.dispatch(toggleCompareOnOff());
const firstResponse = store.getActions()[0];
const secondResponse = store.getActions()[1];
+ const thirdResponse = store.getActions()[2];
expect(firstResponse.type).toEqual(INIT_SECOND_LAYER_GROUP);
- expect(secondResponse.type).toEqual(CONSTANTS.TOGGLE_ON_OFF);
+ expect(secondResponse.type).toEqual(INIT_SECOND_DATE);
+ expect(thirdResponse.type).toEqual(CONSTANTS.TOGGLE_ON_OFF);
});
test(
diff --git a/web/js/modules/date/actions.js b/web/js/modules/date/actions.js
index c89024c13..dc7d614a2 100644
--- a/web/js/modules/date/actions.js
+++ b/web/js/modules/date/actions.js
@@ -5,6 +5,7 @@ import {
SELECT_DATE,
UPDATE_APP_NOW,
TOGGLE_CUSTOM_MODAL,
+ INIT_SECOND_DATE,
ARROW_DOWN,
ARROW_UP,
SET_PRELOAD,
@@ -48,6 +49,11 @@ export function updateAppNow(date) {
value: date,
};
}
+export function initSecondDate() {
+ return {
+ type: INIT_SECOND_DATE,
+ };
+}
export function selectDate(date) {
return (dispatch, getState) => {
const state = getState();
diff --git a/web/js/modules/date/constants.js b/web/js/modules/date/constants.js
index 9fb2214ce..af5a27350 100644
--- a/web/js/modules/date/constants.js
+++ b/web/js/modules/date/constants.js
@@ -4,6 +4,7 @@ export const CHANGE_TIME_SCALE = 'DATE/CHANGE_TIME_SCALE';
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 SET_PRELOAD = 'DATE/SET_PRELOAD';
diff --git a/web/js/modules/date/reducers.js b/web/js/modules/date/reducers.js
index 658879365..eb93bf56c 100644
--- a/web/js/modules/date/reducers.js
+++ b/web/js/modules/date/reducers.js
@@ -6,6 +6,7 @@ import {
UPDATE_APP_NOW,
TOGGLE_CUSTOM_MODAL,
customModalType,
+ INIT_SECOND_DATE,
ARROW_DOWN,
ARROW_UP,
SET_PRELOAD,
@@ -45,6 +46,11 @@ export function dateReducer(state = dateReducerState, action) {
...state,
selectedZoom: action.value,
};
+ case INIT_SECOND_DATE:
+ return {
+ ...state,
+ selectedB: util.dateAdd(state.selected, 'day', -7),
+ };
case CHANGE_CUSTOM_INTERVAL:
return {
...state,