From b4cd78d8fa58adc8c72cc7e983d55666092ecaae Mon Sep 17 00:00:00 2001
From: mbucknell <mbucknell@usgs.gov>
Date: Fri, 17 Apr 2020 10:31:07 -0500
Subject: [PATCH] But time zone fetch in it's own reducer. It's not really part
of time series retrieval and it's possible that the time zone may need to be
used by other components.
---
.../components/hydrograph/date-controls.js | 5 +-
.../components/hydrograph/drawing-data.js | 7 +-
.../hydrograph/drawing-data.spec.js | 4 +-
.../scripts/components/hydrograph/index.js | 3 +-
.../components/hydrograph/index.spec.js | 13 +--
.../components/hydrograph/time-series.js | 3 +-
.../components/hydrograph/time-series.spec.js | 10 +-
assets/src/scripts/index.spec.js | 2 +
.../scripts/selectors/time-series-selector.js | 9 +-
.../selectors/time-series-selector.spec.js | 20 +---
.../scripts/selectors/time-zone-selector.js | 3 +
.../selectors/time-zone-selector.spec.js | 17 ++++
assets/src/scripts/store/index.js | 27 ++----
assets/src/scripts/store/index.spec.js | 93 +------------------
.../src/scripts/store/series-reducer.spec.js | 12 ---
assets/src/scripts/store/time-zone.js | 47 ++++++++++
assets/src/scripts/store/time-zone.spec.js | 66 +++++++++++++
assets/src/scripts/url-params.js | 5 +-
assets/src/scripts/url-params.spec.js | 4 +-
.../src/scripts/web-services/models.spec.js | 40 +++++++-
20 files changed, 215 insertions(+), 175 deletions(-)
create mode 100644 assets/src/scripts/selectors/time-zone-selector.js
create mode 100644 assets/src/scripts/selectors/time-zone-selector.spec.js
create mode 100644 assets/src/scripts/store/time-zone.js
create mode 100644 assets/src/scripts/store/time-zone.spec.js
diff --git a/assets/src/scripts/components/hydrograph/date-controls.js b/assets/src/scripts/components/hydrograph/date-controls.js
index c48ee3be4..054053e82 100644
--- a/assets/src/scripts/components/hydrograph/date-controls.js
+++ b/assets/src/scripts/components/hydrograph/date-controls.js
@@ -8,9 +8,8 @@ import {
isLoadingTS,
hasAnyTimeSeries,
getCurrentDateRange,
- getCustomTimeRange,
- getIanaTimeZone
-} from '../../selectors/time-series-selector';
+ getCustomTimeRange} from '../../selectors/time-series-selector';
+import {getIanaTimeZone} from '../../selectors/time-zone-selector';
import {Actions} from '../../store';
diff --git a/assets/src/scripts/components/hydrograph/drawing-data.js b/assets/src/scripts/components/hydrograph/drawing-data.js
index 7e821a960..c415b2f99 100644
--- a/assets/src/scripts/components/hydrograph/drawing-data.js
+++ b/assets/src/scripts/components/hydrograph/drawing-data.js
@@ -6,9 +6,10 @@ import {createSelector} from 'reselect';
import {format} from 'd3-format';
import config from '../../config';
-import {getVariables, getCurrentMethodID, getTimeSeries, getCurrentVariableTimeSeries, getTimeSeriesForTsKey,
- getTsRequestKey, getRequestTimeRange, getIanaTimeZone} from '../../selectors/time-series-selector';
import {getCurrentVariableMedianStatistics} from '../../selectors/median-statistics-selector';
+import {getVariables, getCurrentMethodID, getTimeSeries, getCurrentVariableTimeSeries, getTimeSeriesForTsKey,
+ getTsRequestKey, getRequestTimeRange} from '../../selectors/time-series-selector';
+import {getIanaTimeZone} from '../../selectors/time-zone-selector';
export const MASK_DESC = {
@@ -290,7 +291,7 @@ export const lineSegmentsSelector = memoize((tsKey, period) => createSelector(
for (let pt of points) {
// Classes to put on the line with this point.
- let lineClasses = getLineClasses(pt, !config.MULTIPLE_TIME_SERIES_METADATA_SELECTOR_ENABLED || currentMethodID === parseInt(methodID));
+ let lineClasses = getLineClasses(pt, !config.MULTIPLE_TIME_SERIES_METADATA_SELECTOR_ENABLED || !currentMethodID || currentMethodID === parseInt(methodID));
// If this is a non-masked data point, split lines if the gap
// from the period point exceeds MAX_LINE_POINT_GAP.
diff --git a/assets/src/scripts/components/hydrograph/drawing-data.spec.js b/assets/src/scripts/components/hydrograph/drawing-data.spec.js
index 5469070c3..378b7b832 100644
--- a/assets/src/scripts/components/hydrograph/drawing-data.spec.js
+++ b/assets/src/scripts/components/hydrograph/drawing-data.spec.js
@@ -925,9 +925,9 @@ describe('drawingData module', () => {
}
}
},
- variables: TEST_VARS,
- ianaTimeZone: 'America/Chicago'
+ variables: TEST_VARS
},
+ ianaTimeZone: 'America/Chicago',
statisticsData : {
median: {
'00010': {
diff --git a/assets/src/scripts/components/hydrograph/index.js b/assets/src/scripts/components/hydrograph/index.js
index 2f5f77229..e7dad1521 100644
--- a/assets/src/scripts/components/hydrograph/index.js
+++ b/assets/src/scripts/components/hydrograph/index.js
@@ -11,6 +11,7 @@ import {link} from '../../lib/d3-redux';
import {hasAnyTimeSeries, getCurrentParmCd, getVariables} from '../../selectors/time-series-selector';
import {Actions} from '../../store';
import {Actions as statisticsDataActions} from '../../store/statistics-data';
+import {Actions as timeZoneActions} from '../../store/time-zone';
import {renderTimeSeriesUrlParams} from '../../url-params';
import {drawDateRangeControls} from './date-controls';
@@ -68,7 +69,7 @@ export const attachToNode = function (store,
.call(drawLoadingIndicator, {showLoadingIndicator: true, sizeClass: 'fa-3x'});
// Fetch time zone
- const fetchTimeZonePromise = store.dispatch(Actions.retrieveLocationTimeZone(latitude, longitude));
+ const fetchTimeZonePromise = store.dispatch(timeZoneActions.retrieveIanaTimeZone(latitude, longitude));
let fetchDataPromise;
if (showOnlyGraph) {
// Only fetch what is needed
diff --git a/assets/src/scripts/components/hydrograph/index.spec.js b/assets/src/scripts/components/hydrograph/index.spec.js
index eca0f704f..38081f9af 100644
--- a/assets/src/scripts/components/hydrograph/index.spec.js
+++ b/assets/src/scripts/components/hydrograph/index.spec.js
@@ -2,6 +2,7 @@ import {select, selectAll} from 'd3-selection';
import {attachToNode} from './index';
import {Actions, configureStore} from '../../store';
import {Actions as statisticsDataActions} from '../../store/statistics-data';
+import {Actions as timeZoneActions} from '../../store/time-zone';
const TEST_STATE = {
@@ -192,13 +193,13 @@ describe('Hydrograph charting and Loading indicators and data alerts', () => {
expect(select(graphNode).select('.loading-indicator').size()).toBe(1);
});
- it('Expects retrieveLocationTimeZone to be called', () => {
- spyOn(Actions, 'retrieveLocationTimeZone').and.callThrough();
+ it('Expects retrieveIanaTimeZone to be called', () => {
+ spyOn(timeZoneActions, 'retrieveIanaTimeZone').and.callThrough();
attachToNode(store, graphNode, {
siteno: '12345678'
});
- expect(Actions.retrieveLocationTimeZone).toHaveBeenCalled();
+ expect(timeZoneActions.retrieveIanaTimeZone).toHaveBeenCalled();
});
describe('Always retrieve the 7 day data and median statistics', () => {
@@ -293,7 +294,7 @@ describe('Hydrograph charting and Loading indicators and data alerts', () => {
});
it('should retrieve data for date range if time zone has been fetched', (done) => {
- spyOn(Actions, 'retrieveLocationTimeZone').and.returnValue(function() {
+ spyOn(timeZoneActions, 'retrieveIanaTimeZone').and.returnValue(function() {
return Promise.resolve({});
});
attachToNode(store, graphNode, {
@@ -356,7 +357,7 @@ describe('Hydrograph charting and Loading indicators and data alerts', () => {
});
it('should retrieve date range for date range parameters if time zone has been fetched', (done) => {
- spyOn(Actions, 'retrieveLocationTimeZone').and.returnValue(function() {
+ spyOn(timeZoneActions, 'retrieveIanaTimeZone').and.returnValue(function() {
return Promise.resolve({});
});
attachToNode(store, graphNode, {
@@ -501,7 +502,7 @@ describe('Hydrograph charting and Loading indicators and data alerts', () => {
it('should have tooltips for the select series table', () => {
// one for each of the two parameters
expect(selectAll('table .tooltip-item').size()).toBe(2);
- })
+ });
});
describe('hide elements when showOnlyGraph is set to true', () => {
diff --git a/assets/src/scripts/components/hydrograph/time-series.js b/assets/src/scripts/components/hydrograph/time-series.js
index ffbb85f70..52b1743db 100644
--- a/assets/src/scripts/components/hydrograph/time-series.js
+++ b/assets/src/scripts/components/hydrograph/time-series.js
@@ -3,9 +3,10 @@ import {DateTime} from 'luxon';
import {createSelector} from 'reselect';
import {
- getRequestTimeRange, getCurrentVariable, getTimeSeriesForTsKey, getIanaTimeZone, getCurrentParmCd, getCurrentMethodID,
+ getRequestTimeRange, getCurrentVariable, getTimeSeriesForTsKey, getCurrentParmCd, getCurrentMethodID,
getMethods
} from '../../selectors/time-series-selector';
+import {getIanaTimeZone} from '../../selectors/time-zone-selector';
export const TEMPERATURE_PARAMETERS = {
diff --git a/assets/src/scripts/components/hydrograph/time-series.spec.js b/assets/src/scripts/components/hydrograph/time-series.spec.js
index 77bf0f12b..033ecb4c2 100644
--- a/assets/src/scripts/components/hydrograph/time-series.spec.js
+++ b/assets/src/scripts/components/hydrograph/time-series.spec.js
@@ -4,8 +4,8 @@ import {
const TEST_DATA = {
+ ianaTimeZone: 'America/Chicago',
series: {
- ianaTimeZone: 'America/Chicago',
timeSeries: {
'00060': {
tsKey: 'current:P7D',
@@ -332,18 +332,14 @@ describe('TimeSeries module', () => {
it('Returns local if timezone is null', () => {
const result = tsTimeZoneSelector({
- series: {
- ianaTimeZone: null
- }
+ ianaTimeZone: null
});
expect(result).toEqual('local');
});
it('Returns the IANA timezone NWIS and IANA agree', () => {
const result = tsTimeZoneSelector({
- series: {
- ianaTimeZone: 'America/New_York'
- }
+ ianaTimeZone: 'America/New_York'
});
expect(result).toEqual('America/New_York');
});
diff --git a/assets/src/scripts/index.spec.js b/assets/src/scripts/index.spec.js
index eac146f0a..a4d065c8e 100644
--- a/assets/src/scripts/index.spec.js
+++ b/assets/src/scripts/index.spec.js
@@ -66,6 +66,7 @@ import './selectors/flood-data-selector.spec';
import './selectors/nldi-data-selector.spec';
import './selectors/median-statistics-selector.spec';
import './selectors/time-series-selector.spec';
+import './selectors/time-zone-selector.spec';
import './store/daily-value-time-series.spec';
import './store/flood-inundation.spec';
@@ -74,6 +75,7 @@ import './store/nldi-data.spec';
import './store/series-reducer.spec';
import './store/statistics-data.spec';
import './store/time-series-state-reducer.spec';
+import './store/time-zone.spec';
import './store/ui-state.spec';
import './tooltips.spec';
diff --git a/assets/src/scripts/selectors/time-series-selector.js b/assets/src/scripts/selectors/time-series-selector.js
index 78326ecfc..dde370768 100644
--- a/assets/src/scripts/selectors/time-series-selector.js
+++ b/assets/src/scripts/selectors/time-series-selector.js
@@ -1,9 +1,10 @@
-import { DateTime } from 'luxon';
-
import memoize from 'fast-memoize';
-import { createSelector } from 'reselect';
import uniq from 'lodash/uniq';
import _includes from 'lodash/includes';
+import { DateTime } from 'luxon';
+import { createSelector } from 'reselect';
+
+import {getIanaTimeZone} from './time-zone-selector';
/*
* Selectors that return properties from the state
@@ -28,8 +29,6 @@ export const getCurrentDateRange = state => state.timeSeriesState.currentDateRan
export const getLoadingTsKeys = state => state.timeSeriesState.loadingTSKeys;
-export const getIanaTimeZone = state => state.series.ianaTimeZone ? state.series.ianaTimeZone : null;
-
export const getNwisTimeZone = state => state.series.timeZones || {};
export const getCustomTimeRange = state => state.timeSeriesState.customTimeRange;
diff --git a/assets/src/scripts/selectors/time-series-selector.spec.js b/assets/src/scripts/selectors/time-series-selector.spec.js
index cca89bfa6..fbc37e2ef 100644
--- a/assets/src/scripts/selectors/time-series-selector.spec.js
+++ b/assets/src/scripts/selectors/time-series-selector.spec.js
@@ -19,7 +19,6 @@ import {
isLoadingTS,
getTSRequest,
getTimeSeriesCollectionIds,
- getIanaTimeZone,
getNwisTimeZone,
getAllMethodsForCurrentVariable,
getCurrentVariableTimeSeries,
@@ -675,8 +674,8 @@ describe('timeSeriesSelector', () => {
describe('getRequestTimeRange', () => {
const TEST_DATA = {
+ ianaTimeZone: 'America/Chicago',
series: {
- ianaTimeZone: 'America/Chicago',
queryInfo: {
'current:P7D': {
notes: {
@@ -756,23 +755,6 @@ describe('timeSeriesSelector', () => {
});
});
- describe('getIanaTimeZone', () => {
-
- it('returns null if series is empty', () => {
- expect(getIanaTimeZone({
- series: {}
- })).toBeNull();
- });
-
- it('returns the time zone when present', () => {
- expect(getIanaTimeZone({
- series: {
- ianaTimeZone: 'America/Los_Angeles'
- }
- })).toEqual('America/Los_Angeles');
- });
- });
-
describe('getNwisTimeZone', () => {
it('returns an empty object if series is empty', () => {
diff --git a/assets/src/scripts/selectors/time-zone-selector.js b/assets/src/scripts/selectors/time-zone-selector.js
new file mode 100644
index 000000000..d3f3cff16
--- /dev/null
+++ b/assets/src/scripts/selectors/time-zone-selector.js
@@ -0,0 +1,3 @@
+export const getIanaTimeZone = state => state.ianaTimeZone ? state.ianaTimeZone : null;
+
+
diff --git a/assets/src/scripts/selectors/time-zone-selector.spec.js b/assets/src/scripts/selectors/time-zone-selector.spec.js
new file mode 100644
index 000000000..c1b8cd74c
--- /dev/null
+++ b/assets/src/scripts/selectors/time-zone-selector.spec.js
@@ -0,0 +1,17 @@
+import {getIanaTimeZone} from './time-zone-selector';
+
+describe('selectors/time-zone-selector', () => {
+ describe('getIanaTimeZone', () => {
+ it('returns null if saved time zone is null', () => {
+ expect(getIanaTimeZone({
+ ianaTimeZone: null
+ })).toBeNull();
+ });
+
+ it('returns the time zone when present', () => {
+ expect(getIanaTimeZone({
+ ianaTimeZone: 'America/Los_Angeles'
+ })).toEqual('America/Los_Angeles');
+ });
+ });
+});
\ No newline at end of file
diff --git a/assets/src/scripts/store/index.js b/assets/src/scripts/store/index.js
index 55f769e18..f460ab8c2 100644
--- a/assets/src/scripts/store/index.js
+++ b/assets/src/scripts/store/index.js
@@ -9,9 +9,10 @@ import {normalize} from '../schema';
import {calcStartTime, sortedParameters} from '../utils';
import {getCurrentParmCd, getCurrentDateRange, hasTimeSeries, getTsRequestKey, getRequestTimeRange,
- getCustomTimeRange, getIanaTimeZone, getTimeSeriesCollectionIds} from '../selectors/time-series-selector';
+ getCustomTimeRange, getTimeSeriesCollectionIds} from '../selectors/time-series-selector';
+import {getIanaTimeZone} from '../selectors/time-zone-selector';
-import {getPreviousYearTimeSeries, getTimeSeries, queryWeatherService} from '../web-services/models';
+import {getPreviousYearTimeSeries, getTimeSeries} from '../web-services/models';
import {Actions as floodInundationActions,
floodDataReducer as floodData,
@@ -22,6 +23,7 @@ import {dailyValueTimeSeriesStateReducer as dailyValueTimeSeriesState} from './d
import {seriesReducer as series} from './series-reducer';
import {statisticsDataReducer as statisticsData} from './statistics-data';
import {timeSeriesStateReducer as timeSeriesState} from './time-series-state-reducer';
+import {timeZoneReducer as ianaTimeZone} from './time-zone';
import {uiReducer as ui} from './ui-state';
const GAGE_HEIGHT_CD = '00065';
@@ -58,19 +60,6 @@ const getCurrentVariableId = function(timeSeries, variables) {
};
export const Actions = {
- retrieveLocationTimeZone(latitude, longitude) {
- return function(dispatch) {
- return queryWeatherService(latitude, longitude).then(
- resp => {
- const tzIANA = resp.properties.timeZone || null; // set to time zone to null if unavailable
- dispatch(Actions.setLocationIanaTimeZone(tzIANA));
- },
- () => {
- dispatch(Actions.setLocationIanaTimeZone(null));
- }
- );
- };
- },
retrieveTimeSeries(siteno, params=null) {
return function (dispatch, getState) {
const currentState = getState();
@@ -371,17 +360,12 @@ export const Actions = {
const endTime = new DateTime.fromISO(endTimeStr, {zone: locationIanaTimeZone}).toMillis();
return dispatch(Actions.retrieveCustomTimeSeries(siteno, startTime, endTime, parmCd));
};
- },
- setLocationIanaTimeZone(ianaTimeZone) {
- return {
- type: 'LOCATION_IANA_TIME_ZONE_SET',
- ianaTimeZone
- };
}
};
const appReducer = combineReducers({
series,
+ ianaTimeZone,
dailyValueTimeSeriesData,
statisticsData,
floodData,
@@ -398,6 +382,7 @@ const MIDDLEWARES = [thunk];
export const configureStore = function (initialState) {
initialState = {
series: {},
+ ianaTimeZone: null,
dailyValueTimeSeriesData: {},
floodData: {
stages: [],
diff --git a/assets/src/scripts/store/index.spec.js b/assets/src/scripts/store/index.spec.js
index b7e4d8afb..d13742b4a 100644
--- a/assets/src/scripts/store/index.spec.js
+++ b/assets/src/scripts/store/index.spec.js
@@ -5,10 +5,6 @@ describe('Redux store', () => {
describe('asynchronous actions', () => {
const SITE_NO = '12345678';
- const LOCATION = {
- latitude: 44.8528,
- longitude: -92.2383
- };
const TEST_STATE = {
series: {
@@ -59,76 +55,6 @@ describe('Redux store', () => {
}
};
- describe('retrieveLocationTimeZone with good data', () => {
- let mockDispatch;
- let mockGetState;
-
- const MOCK_WEATHER_SERVICE_DATA = '{"properties" : {"timeZone" : "America/Chicago"}}';
-
- beforeEach(() => {
- jasmine.Ajax.install();
-
- jasmine.Ajax.stubRequest(/api\.weather\.gov/).andReturn({
- status: 200,
- response: MOCK_WEATHER_SERVICE_DATA,
- contentType: 'application/json'
- });
-
- mockDispatch = jasmine.createSpy('mockDispatch');
- mockGetState = jasmine.createSpy('mockGetState').and.returnValue(TEST_STATE);
- configureStore();
- });
-
- afterEach(() => {
- jasmine.Ajax.uninstall();
- });
-
- it('fetches data from the weather service', () => {
- Actions.retrieveLocationTimeZone(LOCATION.latitude, LOCATION.longitude)(mockDispatch, mockGetState);
- expect(jasmine.Ajax.requests.mostRecent().url).toContain('api.weather.gov');
- });
-
- it('gets the data and sets the timezone', (done) => {
- spyOn(Actions, 'setLocationIanaTimeZone');
- let p = Actions.retrieveLocationTimeZone(LOCATION.latitude, LOCATION.longitude)(mockDispatch, mockGetState);
- p.then(() => {
- expect(Actions.setLocationIanaTimeZone.calls.count()).toBe(1);
- expect(Actions.setLocationIanaTimeZone).toHaveBeenCalledWith('America/Chicago');
- done();
- });
- });
- });
-
- describe('retrieveLocationTimeZone with bad data', () => {
- let mockDispatch;
- let mockGetState;
-
- beforeEach(() => {
- jasmine.Ajax.install();
- mockDispatch = jasmine.createSpy('mockDispatch');
- mockGetState = jasmine.createSpy('mockGetState').and.returnValue(TEST_STATE);
- configureStore();
- });
-
- afterEach(() => {
- jasmine.Ajax.uninstall();
- });
-
- it('gets the data and sets the timezone to something', (done) => {
- spyOn(Actions, 'setLocationIanaTimeZone');
- let p = Actions.retrieveLocationTimeZone(LOCATION.latitude, LOCATION.longitude)(mockDispatch, mockGetState);
- jasmine.Ajax.requests.mostRecent().respondWith({
- status: 500
- });
- p.then(
- () => {
- expect(Actions.setLocationIanaTimeZone.calls.count()).toBe(1);
- expect(Actions.setLocationIanaTimeZone).toHaveBeenCalledWith(null);
- done();
- });
- });
- });
-
describe('retrieveTimeSeries with good data', () => {
let mockDispatch;
let mockGetState;
@@ -844,9 +770,8 @@ describe('Redux store', () => {
beforeEach(() => {
mockDispatch = jasmine.createSpy('mockDispatch');
mockGetState = jasmine.createSpy('mockGetState').and.returnValue({
- series: {
- ianaTimeZone: 'America/Chicago'
- }
+ ianaTimeZone: 'America/Chicago',
+ series: {}
});
spyOn(Actions, 'retrieveCustomTimeSeries');
@@ -873,9 +798,8 @@ describe('Redux store', () => {
beforeEach(() => {
mockDispatch = jasmine.createSpy('mockDispatch');
mockGetState = jasmine.createSpy('mockGetState').and.returnValue({
- series: {
- ianaTimeZone: 'America/Chicago'
- }
+ ianaTimeZone: 'America/Chicago',
+ series: {}
});
spyOn(Actions, 'retrieveCustomTimeSeries');
@@ -953,15 +877,6 @@ describe('Redux store', () => {
type: 'TIME_SERIES_PLAY_STOP'
});
});
-
- it('should create an action to set the location IANA time zone', () => {
- expect(Actions.setLocationIanaTimeZone('America/Chicago')).toEqual({
- type: 'LOCATION_IANA_TIME_ZONE_SET',
- ianaTimeZone: 'America/Chicago'
- });
- });
-
-
});
});
diff --git a/assets/src/scripts/store/series-reducer.spec.js b/assets/src/scripts/store/series-reducer.spec.js
index 351800fee..ded3aeb87 100644
--- a/assets/src/scripts/store/series-reducer.spec.js
+++ b/assets/src/scripts/store/series-reducer.spec.js
@@ -166,16 +166,4 @@ describe('series-reducer', () => {
});
});
});
-
- describe('LOCATION_IANA_TIME_ZONE_SET', () => {
-
- it('should add the time zome', () => {
- expect(seriesReducer({}, {
- type: 'LOCATION_IANA_TIME_ZONE_SET',
- ianaTimeZone: 'America/Juneau'
- })).toEqual({
- ianaTimeZone: 'America/Juneau'
- });
- });
- });
});
diff --git a/assets/src/scripts/store/time-zone.js b/assets/src/scripts/store/time-zone.js
new file mode 100644
index 000000000..bd27d727a
--- /dev/null
+++ b/assets/src/scripts/store/time-zone.js
@@ -0,0 +1,47 @@
+import {queryWeatherService} from '../web-services/models';
+
+/*
+ * Synchronous Redux action to update the IANA time zone
+ * @param {String} timeZone
+ * @return {Object} Redux action
+ */
+const setIanaTimeZone = function(timeZone) {
+ return {
+ type: 'SET_IANA_TIME_ZONE',
+ timeZone
+ };
+};
+
+/*
+ * Asynchronous Redux action to fetch the time zone using the site's location
+ * @param {String} latitude
+ * @param {String} longitude
+ * @return {Function} which returns a promise which resolves when the fetch is completed
+ */
+const retrieveIanaTimeZone = function(latitude, longitude) {
+ return function(dispatch) {
+ return queryWeatherService(latitude, longitude).then(
+ resp => {
+ const tzIANA = resp.properties.timeZone || null; // set to time zone to null if unavailable
+ dispatch(setIanaTimeZone(tzIANA));
+ },
+ () => {
+ dispatch(setIanaTimeZone(null));
+ }
+ );
+ };
+};
+
+export const timeZoneReducer = function(ianaTimeZone='', action) {
+ switch (action.type) {
+ case 'SET_IANA_TIME_ZONE':
+ return action.timeZone;
+ default:
+ return ianaTimeZone;
+ }
+};
+
+export const Actions = {
+ setIanaTimeZone,
+ retrieveIanaTimeZone
+};
\ No newline at end of file
diff --git a/assets/src/scripts/store/time-zone.spec.js b/assets/src/scripts/store/time-zone.spec.js
new file mode 100644
index 000000000..3376accc2
--- /dev/null
+++ b/assets/src/scripts/store/time-zone.spec.js
@@ -0,0 +1,66 @@
+import {applyMiddleware, combineReducers, createStore} from "redux";
+import {default as thunk} from 'redux-thunk';
+
+import {Actions, timeZoneReducer} from './time-zone';
+
+describe('store/time-zone module', () => {
+ let store;
+
+ beforeEach(() => {
+ store = createStore(
+ combineReducers({
+ ianaTimeZone: timeZoneReducer
+ }),
+ {
+ ianaTimeZone: ''
+ },
+ applyMiddleware(thunk)
+ );
+ jasmine.Ajax.install();
+ });
+
+ afterEach(() => {
+ jasmine.Ajax.uninstall();
+ });
+
+ describe('timeZoneReduer', () => {
+ describe('Actions.setIanaTimeZone', () => {
+ it('sets the time zone', () => {
+ store.dispatch(Actions.setIanaTimeZone('America/Chicago'));
+
+ expect(store.getState().ianaTimeZone).toBe('America/Chicago');
+ });
+ });
+
+ describe('Actions.retrieveIanaTimeZone', () => {
+ it('Sets the latitude and longitude in the query', () => {
+ store.dispatch(Actions.retrieveIanaTimeZone('45.3', '-100.2'));
+ expect(jasmine.Ajax.requests.mostRecent().url).toContain('45.3,-100.2');
+ });
+
+ it('Successful fetch assigns time zone', (done) => {
+ const promise = store.dispatch(Actions.retrieveIanaTimeZone('45.3', '-100.2'));
+ jasmine.Ajax.requests.mostRecent().respondWith({
+ status: 200,
+ responseText: '{"properties" : {"timeZone" : "America/Chicago"}}'
+ });
+ promise.then(() => {
+ expect(store.getState().ianaTimeZone).toBe('America/Chicago');
+ done();
+ });
+ });
+
+ it('Failed fetch assigns time zone to be null', (done) => {
+ const promise = store.dispatch(Actions.retrieveIanaTimeZone('45.3', '-100.2'));
+ jasmine.Ajax.requests.mostRecent().respondWith({
+ status: 500,
+ responseText: '{"properties" : {}}'
+ });
+ promise.then(() => {
+ expect(store.getState().ianaTimeZone).toBeNull();
+ done();
+ });
+ });
+ });
+ });
+});
\ No newline at end of file
diff --git a/assets/src/scripts/url-params.js b/assets/src/scripts/url-params.js
index d778aa082..87a8fde55 100644
--- a/assets/src/scripts/url-params.js
+++ b/assets/src/scripts/url-params.js
@@ -2,8 +2,9 @@ import {DateTime} from 'luxon';
import {createStructuredSelector} from 'reselect';
import {listen} from './lib/d3-redux';
-import {getCurrentMethodID, getAllMethodsForCurrentVariable, getCurrentDateRange, getCustomTimeRange, getCurrentParmCd,
- getIanaTimeZone} from './selectors/time-series-selector';
+import {getCurrentMethodID, getAllMethodsForCurrentVariable, getCurrentDateRange, getCustomTimeRange, getCurrentParmCd}
+ from './selectors/time-series-selector';
+import {getIanaTimeZone} from './selectors/time-zone-selector';
/*
* Return {String} hash part of url minus the leading '#'.
diff --git a/assets/src/scripts/url-params.spec.js b/assets/src/scripts/url-params.spec.js
index a0b6994c0..0f49cd1ed 100644
--- a/assets/src/scripts/url-params.spec.js
+++ b/assets/src/scripts/url-params.spec.js
@@ -50,9 +50,9 @@ describe('url-params module', () => {
method: 69928,
variable: '123456'
}
- },
- ianaTimeZone: 'America/New_York'
+ }
},
+ ianaTimeZone: 'America/New_York',
timeSeriesState: {
currentVariableID: '123456',
currentDateRange: 'P7D',
diff --git a/assets/src/scripts/web-services/models.spec.js b/assets/src/scripts/web-services/models.spec.js
index e34499c16..21a55ffad 100644
--- a/assets/src/scripts/web-services/models.spec.js
+++ b/assets/src/scripts/web-services/models.spec.js
@@ -1,4 +1,4 @@
-import {getPreviousYearTimeSeries, getTimeSeries} from './models';
+import {getPreviousYearTimeSeries, getTimeSeries, queryWeatherService} from './models';
describe('Models module', () => {
@@ -13,7 +13,6 @@ describe('Models module', () => {
});
describe('getTimeSeries function', () => {
-
const paramCode = '00060';
const siteID = '05413500';
@@ -124,7 +123,44 @@ describe('Models module', () => {
});
});
+ describe('queryWeatherService', () => {
+ it('Expect the url to contain the latitude and longitude', () => {
+ queryWeatherService('45.3', '-100.2');
+
+ expect(jasmine.Ajax.requests.mostRecent().url).toContain('45.3,-100.2');
+ });
+
+ it('Expect that a successful fetch returns the response', (done) => {
+ const MOCK_WEATHER_SERVICE_DATA = '{"properties" : {"timeZone" : "America/Chicago"}}';
+ const promise = queryWeatherService('45.3', '100.2');
+ jasmine.Ajax.requests.mostRecent().respondWith({
+ status: 200,
+ responseText: MOCK_WEATHER_SERVICE_DATA
+ });
+ promise.then((response) => {
+ expect(response).toEqual({
+ properties: {
+ timeZone: 'America/Chicago'
+ }
+ });
+ done();
+ });
+ });
+ it('Expect that a failed fetch returns a JSON object with empty properties', (done) => {
+ const promise = queryWeatherService('45.3', '100.2');
+ jasmine.Ajax.requests.mostRecent().respondWith({
+ status: 500,
+ responseText: 'Internal server error'
+ });
+ promise.then((response) => {
+ expect(response).toEqual({
+ properties: {}
+ });
+ done();
+ });
+ });
+ });
});
const MOCK_DATA = `
--
GitLab