Interactive interface for browsing global, full-resolution satellite imagery
WV-2816: ESLint Cleanup - Default Parameter Order (#6434)
Jason Hurley808615b337f3
diff --git a/web/.eslintrc b/web/.eslintrcindex fa284a6a1..b22cde95b 100644--- a/web/.eslintrc+++ b/web/.eslintrc@@ -151,10 +151,21 @@"react/no-unstable-nested-components": "error","react/prop-types": "error","react/no-unused-prop-types": "error",- "default-param-last": "warn", // 42 errors across 34 files"prefer-regex-literals": "error","no-promise-executor-return": "error"}+ },+ {+ "files": [+ "**/reducer.js",+ "**/reducer.test.js",+ "**/reducers.js",+ "**/reducers.test.js",+ "**/combine-reducers.js"+ ],+ "rules": {+ "default-param-last": "warn"+ }}]}diff --git a/web/js/containers/animation-widget/animation-widget.js b/web/js/containers/animation-widget/animation-widget.jsindex 208c2945a..25a57c288 100644--- a/web/js/containers/animation-widget/animation-widget.js+++ b/web/js/containers/animation-widget/animation-widget.js@@ -430,10 +430,10 @@ const mapStateToProps = (state) => {startDate,endDate,TIME_SCALE_FROM_NUMBER[useInterval],- useDelta,frameLimit,autoSelected,layers.active.layers,+ useDelta,);const currentDate = getSelectedDate(state);let snappedCurrentDate;diff --git a/web/js/containers/gif.js b/web/js/containers/gif.jsindex 6378f4f48..8c27e78fc 100644--- a/web/js/containers/gif.js+++ b/web/js/containers/gif.js@@ -452,10 +452,10 @@ function mapStateToProps(state) {customSelected? TIME_SCALE_FROM_NUMBER[customInterval]: TIME_SCALE_FROM_NUMBER[interval],- customSelected ? customDelta : 1,null,autoSelected,layers.active.layers,+ customSelected ? customDelta : 1,),getImageArrayFunc: (options, dimensions) => getImageArray(options,diff --git a/web/js/containers/map-interactions/ol-vector-interactions.js b/web/js/containers/map-interactions/ol-vector-interactions.jsindex 6ad70d13d..3e77225b5 100644--- a/web/js/containers/map-interactions/ol-vector-interactions.js+++ b/web/js/containers/map-interactions/ol-vector-interactions.js@@ -89,7 +89,7 @@ export class VectorInteractions extends React.Component {// only allow hover footprints on selected side of A/B comparisonif (compareActive- && !isFromActiveCompareRegion(pixels, activeString, compareState, swipeOffset)) {+ && !isFromActiveCompareRegion(pixels, activeString, swipeOffset, compareState)) {return;}@@ -139,7 +139,7 @@ export class VectorInteractions extends React.Component {const isRenderedFeature = isWrapped ? lon > -250|| lon < 250 || lat > -90 || lat < 90 : true;if (isRenderedFeature- && isFromActiveCompareRegion(pixel, layer.wv.group, compareState, swipeOffset)) {+ && isFromActiveCompareRegion(pixel, layer.wv.group, swipeOffset, compareState)) {isActiveLayer = true;}});diff --git a/web/js/map/natural-events/natural-events.js b/web/js/map/natural-events/natural-events.jsindex f96db5e41..85c10b145 100644--- a/web/js/map/natural-events/natural-events.js+++ b/web/js/map/natural-events/natural-events.js@@ -186,7 +186,7 @@ class NaturalEvents extends React.Component {} else {coordinates = olProj.transform(geometry.coordinates, CRS.GEOGRAPHIC, crs);}- return fly(map, proj, coordinates, zoom, null, isKioskModeActive);+ return fly(map, proj, coordinates, isKioskModeActive, zoom, null);};render() {diff --git a/web/js/map/runningdata.js b/web/js/map/runningdata.jsindex fc4fed7f1..11467271a 100644--- a/web/js/map/runningdata.js+++ b/web/js/map/runningdata.js@@ -47,8 +47,8 @@ export default function MapRunningData(compareUi, store) {const inCompareRegion = isFromActiveCompareRegion(pixel,layer.wv.group,- compare,swipeOffset,+ compare,);const hasPalette = !lodashIsEmpty(def.palette);return !isRenderedFeature || !inCompareRegiondiff --git a/web/js/map/util.js b/web/js/map/util.jsindex dfa89c0c4..dd965779e 100644--- a/web/js/map/util.js+++ b/web/js/map/util.js@@ -145,7 +145,7 @@ const getBestZoom = function(distance, start, end, view) {* @param {integer} endZoom Ending Zoom Level* @return {Promise} Promise that is fulfilled when animation completes*/-export function fly (map, proj, endPointArray, endZoom = 5, rotation = 0, isKioskModeActive) {+export function fly (map, proj, endPointArray, isKioskModeActive, endZoom = 5, rotation = 0) {let endPoint = endPointArray;const view = map.getView();const polarProjectionCheck = proj.selected.id !== 'geographic'; // boolean if current projection is polardiff --git a/web/js/mapUI/components/update-projection/updateProjection.js b/web/js/mapUI/components/update-projection/updateProjection.jsindex e4f07d3bf..7ec13cacb 100644--- a/web/js/mapUI/components/update-projection/updateProjection.js+++ b/web/js/mapUI/components/update-projection/updateProjection.js@@ -309,7 +309,7 @@ function UpdateProjection(props) {const zoom = ui.selected.getView().getZoomForResolution(resolution);// Animate to extent, zoom & rotate:// Don't animate when an event is selected (Event selection already animates)- return fly(ui.selected, proj, coordinates, zoom, rotation, isKioskModeActive);+ return fly(ui.selected, proj, coordinates, isKioskModeActive, zoom, rotation);};const actionSwitch = () => {diff --git a/web/js/modules/animation/util.js b/web/js/modules/animation/util.jsindex 595f8b13e..deaa5c436 100644--- a/web/js/modules/animation/util.js+++ b/web/js/modules/animation/util.js@@ -56,10 +56,10 @@ export function getNumberOfSteps(start,end,interval,- stateDelta = 1,maxToCheck,autoSelected,layers,+ stateDelta = 1,) {let delta = stateDelta;if (autoSelected) {diff --git a/web/js/modules/compare/util.js b/web/js/modules/compare/util.jsindex 3cb508e26..c1cd0414d 100644--- a/web/js/modules/compare/util.js+++ b/web/js/modules/compare/util.js@@ -29,7 +29,7 @@ export function mapLocationToCompareState(parameters, stateFromLocationObj) {* @param {Array} coords | Coordinates of hover point* @param {Object} layerAttributes | Layer Properties*/-export function isFromActiveCompareRegion(coords, group, compare = {}, swipeOffset) {+export function isFromActiveCompareRegion(coords, group, swipeOffset, compare = {}) {const { active, mode, isCompareA } = compare;if (active) {if (mode !== 'swipe') {diff --git a/web/js/modules/date/actions.test.js b/web/js/modules/date/actions.test.jsindex 24ce2755b..533e0ba18 100644--- a/web/js/modules/date/actions.test.js+++ b/web/js/modules/date/actions.test.js@@ -41,9 +41,9 @@ function getState(layers) {function addMockLayer(layerId, layerArray) {return addLayer(layerId,- {},layerArray,config.layers,+ {},getLayers(getState(layerArray), { group: 'all' }).overlays.length,);@@ -94,7 +94,7 @@ describe('Date timescale changes', () => {lastArrowDirection: 'left',outOfStep: true,};- let layers = addLayer('terra-cr', {}, [], config.layers, 0);+ let layers = addLayer('terra-cr', [], config.layers, {}, 0);layers = addMockLayer('aqua-cr', layers);const store = mockStore({date: {@@ -137,7 +137,7 @@ describe('Date timescale changes', () => {lastArrowDirection: 'right',outOfStep: false,};- let layers = addLayer('terra-cr', {}, [], config.layers, 0);+ let layers = addLayer('terra-cr', [], config.layers, {}, 0);layers = addMockLayer('aqua-cr', layers);const store = mockStore({date: {diff --git a/web/js/modules/layers/actions.js b/web/js/modules/layers/actions.jsindex 98b882002..cfe051b12 100644--- a/web/js/modules/layers/actions.js+++ b/web/js/modules/layers/actions.js@@ -122,7 +122,7 @@ export function addLayer(id) {return (dispatch, getState) => {const state = getState();const {- layers, compare, proj, config,+ layers, compare, config,} = state;const layerObj = layers.layerConfig[id];const { groupOverlays } = layers[compare.activeString];@@ -130,11 +130,10 @@ export function addLayer(id) {const overlays = getLayersSelector(state, { group: 'overlays' });const newLayers = addLayerSelector(id,- {},activeLayers,layers.layerConfig,+ {},overlays.length || 0,- proj.id,groupOverlays,);const projections = Object.keys(config.projections);@@ -426,7 +425,7 @@ export function updateBandCombination(id, bandCombo, layerIndex, selectedPreset)return (dispatch, getState) => {const state = getState();const {- layers, compare, proj, config,+ layers, compare, config,} = state;const layerObj = layers.layerConfig[id];const { groupOverlays } = layers[compare.activeString];@@ -434,11 +433,10 @@ export function updateBandCombination(id, bandCombo, layerIndex, selectedPreset)const overlays = getLayersSelector(state, { group: 'overlays' });const newLayers = addLayerSelector(id,- {},activeLayers,layers.layerConfig,+ {},overlays.length || 0,- proj.id,groupOverlays,bandCombo,selectedPreset,diff --git a/web/js/modules/layers/actions.test.js b/web/js/modules/layers/actions.test.jsindex 1b684ab5b..2bce5bb0e 100644--- a/web/js/modules/layers/actions.test.js+++ b/web/js/modules/layers/actions.test.js@@ -42,11 +42,10 @@ function getState(layers) {function addMockLayer(layerId, layerArray, proj) {return addLayer(layerId,- {},layerArray,config.layers,+ {},getLayers(getState(layerArray), { group: 'all' }, layerArray).overlays.length,- proj,);}@@ -56,7 +55,7 @@ describe('Layer actions', () => {beforeEach(() => {layers = [];- layers = addLayer('terra-cr', {}, [], config.layers, 0);+ layers = addLayer('terra-cr', [], config.layers, {}, 0);layers = addMockLayer('aqua-cr', layers);layers = addMockLayer('terra-aod', layers);layers = addMockLayer('aqua-aod', layers);diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.jsindex 544e99ee6..9098adf12 100644--- a/web/js/modules/layers/selectors.js+++ b/web/js/modules/layers/selectors.js@@ -23,14 +23,13 @@ const getLayerId = (state, { layer }) => layer && layer.id;export function addLayer(id,- spec = {},layersParam,layerConfig,- overlayLength,- projection,- groupOverlays,- bandComboParam,- selectedPresetParam,+ spec = {},+ overlayLength = null,+ groupOverlays = null,+ bandComboParam = null,+ selectedPresetParam = null,) {const layers = lodashCloneDeep(layersParam);if (lodashFind(layers, { id })) {@@ -119,11 +118,11 @@ export function addLayer(* @param {*} layerConfig*/export function resetLayers(config) {- const { defaults: { startingLayers, projection }, layers: layerConfig } = config;+ const { defaults: { startingLayers }, layers: layerConfig } = config;let layers = [];if (startingLayers) {lodashEach(startingLayers, (start) => {- layers = addLayer(start.id, start, layers, layerConfig, null, projection);+ layers = addLayer(start.id, layers, layerConfig, start);});}return layers;@@ -434,7 +433,7 @@ export function available(id, date, layers, parameters) {return true;}-function forGroup(group, spec = {}, activeLayers, state) {+function forGroup(group, activeLayers, state, spec = {}) {const projId = state.proj.id;let results = [];const defs = lodashFilter(activeLayers, { group });@@ -465,10 +464,10 @@ function forGroup(group, spec = {}, activeLayers, state) {* @param {*} spec* @param {*} state*/-export function getLayers(state, spec = {}, layersParam) {+export function getLayers(state, spec = {}, layersParam = null) {const layers = layersParam || getActiveLayers(state);- const baselayers = forGroup('baselayers', spec, layers, state);- const overlays = forGroup('overlays', spec, layers, state);+ const baselayers = forGroup('baselayers', layers, state, spec);+ const overlays = forGroup('overlays', layers, state, spec);if (spec.group === 'baselayers') {return baselayers;}@@ -758,12 +757,10 @@ export function activateLayersForEventCategory(state, category) {const overlays = getLayers(state, { group: 'overlays' }, newLayers);newLayers = addLayer(id,- { visible },newLayers,layerConfig,+ { visible },overlays.length,- projection,- null,);}});diff --git a/web/js/modules/layers/selectors.test.js b/web/js/modules/layers/selectors.test.jsindex d3356c684..986f0ddbf 100644--- a/web/js/modules/layers/selectors.test.js+++ b/web/js/modules/layers/selectors.test.js@@ -27,9 +27,9 @@ function getState(layers) {}test('adds base layer', () => {- let layers = addLayer('terra-cr', {}, [], config.layers, 0);- layers = addLayer('terra-aod', {}, layers, config.layers, 0);- layers = addLayer('mask', {}, layers, config.layers, 1);+ let layers = addLayer('terra-cr', [], config.layers, {}, 0);+ layers = addLayer('terra-aod', layers, config.layers, {}, 0);+ layers = addLayer('mask', layers, config.layers, {}, 1);const layerList = getLayers(getState(layers), {}).map((x) => x.id);@@ -37,34 +37,34 @@ test('adds base layer', () => {});test('adds overlay layer', () => {- let layers = addLayer('terra-cr', {}, [], config.layers, 0);- layers = addLayer('terra-aod', {}, layers, config.layers, 0);- layers = addLayer('combo-aod', {}, layers, config.layers, 1);+ let layers = addLayer('terra-cr', [], config.layers, {}, 0);+ layers = addLayer('terra-aod', layers, config.layers, {}, 0);+ layers = addLayer('combo-aod', layers, config.layers, {}, 1);const layerList = getLayers(getState(layers), {}).map((x) => x.id);expect(layerList).toEqual(['terra-cr', 'combo-aod', 'terra-aod']);});test('does not add duplicate layer', () => {- let layers = addLayer('terra-cr', {}, [], config.layers, 0);- layers = addLayer('terra-aod', {}, layers, config.layers, 0);- layers = addLayer('terra-cr', {}, layers, config.layers, 1);+ let layers = addLayer('terra-cr', [], config.layers, {}, 0);+ layers = addLayer('terra-aod', layers, config.layers, {}, 0);+ layers = addLayer('terra-cr', layers, config.layers, {}, 1);- const layerList = getLayers(getState(layers), {}).map((x) => x.id);+ const layerList = getLayers(getState(layers)).map((x) => x.id);expect(layerList).toEqual(['terra-cr', 'terra-aod']);});test('resets to default layers', () => {const layers = resetLayers(config);- const layerList = getLayers(getState(layers), {}).map((x) => x.id);+ const layerList = getLayers(getState(layers)).map((x) => x.id);expect(layerList).toEqual(['aqua-cr', 'terra-cr', 'terra-aod']);});test('gets layers in reverse', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers), { reverse: true }).map((x) => x.id,@@ -73,10 +73,10 @@ test('gets layers in reverse', () => {});test('gets base layers', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers),{ group: 'baselayers' },@@ -85,10 +85,10 @@ test('gets base layers', () => {});test('gets overlay layers', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers),{ group: 'overlays' },@@ -97,10 +97,10 @@ test('gets overlay layers', () => {});test('gets all groups', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers), { group: 'all' });expect(layerList.baselayers[0].id).toBe('aqua-cr');@@ -124,10 +124,10 @@ test('gets all groups', () => {// });test('obscured base layer is not renderable', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers), { renderable: true }).map((x) => x.id,);@@ -135,10 +135,10 @@ test('obscured base layer is not renderable', () => {});test('base layer is not obscured by a hidden layer', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', { visible: false }, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers, { visible: false });+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers), { renderable: true }).map((x) => x.id,@@ -147,10 +147,10 @@ test('base layer is not obscured by a hidden layer', () => {});test('layer with zero opacity is not renderable', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', { opacity: 0 }, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers, { opacity: 0 });const layerList = getLayers(getState(layers), { renderable: true }).map((x) => x.id,@@ -159,10 +159,10 @@ test('layer with zero opacity is not renderable', () => {});test('layer outside date range is not renderable', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);let state = getState(layers);state = update(state, {date: { selected: { $set: new Date(Date.UTC(2001, 0, 1)) } },@@ -173,10 +173,10 @@ test('layer outside date range is not renderable', () => {});test('all layers are visible', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const layerList = getLayers(getState(layers)).map((x) => x.id,@@ -200,20 +200,20 @@ test('all layers are visible', () => {// });test('push overlay to bottom', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);layers = pushToBottom('aqua-cr', layers);- const layerList = getLayers(getState(layers), {}).map((x) => x.id);+ const layerList = getLayers(getState(layers)).map((x) => x.id);expect(layerList).toEqual(['terra-cr', 'aqua-cr', 'aqua-aod', 'terra-aod']);});test('move base layer before', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);moveBefore('terra-cr', 'aqua-cr', layers);const layerList = getLayers(getState(layers), {}).map((x) => x.id);@@ -221,13 +221,13 @@ test('move base layer before', () => {});test('move overlay before', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);moveBefore('terra-aod', 'aqua-aod', layers);- const layerList = getLayers(getState(layers), {}).map((x) => x.id);+ const layerList = getLayers(getState(layers)).map((x) => x.id);expect(layerList).toEqual(['aqua-cr', 'terra-cr', 'terra-aod', 'aqua-aod']);});@@ -289,10 +289,10 @@ function getDateRangesTestState(stateObj) {}test('date range for ongoing layers', () => {- let layers = addLayer('terra-cr', {}, [], config.layers);- layers = addLayer('aqua-cr', {}, layers, config.layers);- layers = addLayer('terra-aod', {}, layers, config.layers);- layers = addLayer('aqua-aod', {}, layers, config.layers);+ let layers = addLayer('terra-cr', [], config.layers);+ layers = addLayer('aqua-cr', layers, config.layers);+ layers = addLayer('terra-aod', layers, config.layers);+ layers = addLayer('aqua-aod', layers, config.layers);const range = dateRange({}, layers, config);expect(range.start).toEqual(new Date(Date.UTC(2000, 0, 1)));@@ -322,8 +322,8 @@ test('date range for ended layers', () => {ongoing: false,};const adjustedConfig = update(config, { layers: { $set: layersConfig } });- let layers = addLayer('end1', {}, [], layersConfig);- layers = addLayer('end2', {}, layers, layersConfig);+ let layers = addLayer('end1', [], layersConfig);+ layers = addLayer('end2', layers, layersConfig);const range = dateRange({}, layers, adjustedConfig);expect(range.start).toEqual(new Date(Date.UTC(1990, 0, 1)));@@ -333,7 +333,7 @@ test('date range for ended layers', () => {test('date range with one layer', () => {let state = getState([]);state = getDateRangesTestState(state);- const layers = addLayer('historical_1', {}, [], state.config.layers);+ const layers = addLayer('historical_1', [], state.config.layers);const range = dateRange({}, layers, state.config);const expectedStartTime = new Date(Date.UTC(2000, 0, 1)).getTime();const expectedEndTime = new Date(Date.UTC(2010, 0, 1, 0, 0, 59)).getTime();@@ -344,8 +344,8 @@ test('date range with one layer', () => {test('date range with two layers', () => {let state = getState([]);state = getDateRangesTestState(state);- let layers = addLayer('historical_1', {}, [], state.config.layers);- layers = addLayer('historical_2', {}, layers, state.config.layers);+ let layers = addLayer('historical_1', [], state.config.layers);+ layers = addLayer('historical_2', layers, state.config.layers);const range = dateRange({}, layers, state.config);const expectedStartTime = new Date(Date.UTC(2000, 0, 1)).getTime();const expectedEndTime = new Date(Date.UTC(2010, 0, 1, 0, 0, 59)).getTime();@@ -356,7 +356,7 @@ test('date range with two layers', () => {test('end of date range is today if no end date', () => {let state = getState([]);state = getDateRangesTestState(state);- const layers = addLayer('active_1', {}, [], state.config.layers);+ const layers = addLayer('active_1', [], state.config.layers);const range = dateRange({}, layers, state.config);const expectedStartTime = new Date(Date.UTC(2005, 0, 1)).getTime();const expectedEndTime = new Date(Date.UTC(2010, 0, 1, 0, 0, 59)).getTime();@@ -367,7 +367,7 @@ test('end of date range is today if no end date', () => {test('no date range with static', () => {let state = getState([]);state = getDateRangesTestState(state);- const layers = addLayer('static', {}, [], state.config.layers);+ const layers = addLayer('static', [], state.config.layers);const range = dateRange({}, layers, state.config);expect(range).toBeFalsy();diff --git a/web/js/modules/layers/util.js b/web/js/modules/layers/util.jsindex d9e284937..708da1b0b 100644--- a/web/js/modules/layers/util.js+++ b/web/js/modules/layers/util.js@@ -1064,7 +1064,6 @@ const createLayerArrayFromState = function(layers, config) {if (lodashIsUndefined(layers)) {return layerArray;}- const projection = lodashGet(config, 'parameters.p') || 'geographic';layers.reverse().forEach((layerDef) => {if (!config.layers[layerDef.id]) {// eslint-disable-next-line no-console@@ -1073,11 +1072,9 @@ const createLayerArrayFromState = function(layers, config) {}layerArray = addLayer(layerDef.id,- getLayerSpec(layerDef.attributes),layerArray,config.layers,- null,- projection,+ getLayerSpec(layerDef.attributes),);});return layerArray;diff --git a/web/js/modules/location-search/util.js b/web/js/modules/location-search/util.jsindex e8a526de3..d24cc16bb 100644--- a/web/js/modules/location-search/util.js+++ b/web/js/modules/location-search/util.js@@ -26,7 +26,7 @@ export function animateCoordinates(map, proj, coordinates, zoom, isKioskModeActiif (proj !== 'geographic') {[x, y] = transform(coordinates, CRS.GEOGRAPHIC, crs);}- fly(map, proj, [x, y], zoom, isKioskModeActive);+ fly(map, proj, [x, y], isKioskModeActive, zoom);}/**diff --git a/web/js/modules/palettes/actions.test.js b/web/js/modules/palettes/actions.test.jsindex 556d75ecd..9f49eb843 100644--- a/web/js/modules/palettes/actions.test.js+++ b/web/js/modules/palettes/actions.test.js@@ -68,8 +68,8 @@ describe('Palette terra-aod fetching with requestPalette action [palettes-action});describe('Test lookup actions [palettes-actions-lookup]', () => {const mockStore = configureMockStore(middlewares);- let layers = addLayer('terra-aod', {}, [], config.layers, 0);- layers = addLayer('aqua-cr', {}, layers, config.layers, 1);+ let layers = addLayer('terra-aod', [], config.layers, {}, 0);+ layers = addLayer('aqua-cr', layers, config.layers, {}, 1);const stateWithLayers = update(state, {layers: { active: { $set: layers } },});diff --git a/web/js/modules/vector-styles/util.js b/web/js/modules/vector-styles/util.jsindex a23571212..36542acfd 100644--- a/web/js/modules/vector-styles/util.js+++ b/web/js/modules/vector-styles/util.js@@ -239,7 +239,7 @@ function getModalContentsAtPixel(mapProps, config, compareState, isMobile) {const type = feature.getGeometry().getType();if (lodashIncludes(def.clickDisabledFeatures, type)- || !isFromActiveCompareRegion(pixels, layer.wv.group, compareState, swipeOffset)) {+ || !isFromActiveCompareRegion(pixels, layer.wv.group, swipeOffset, compareState)) {return true;}if (def.vectorData && def.vectorData.id && def.title) {diff --git a/web/js/util/util.js b/web/js/util/util.jsindex 61ac66501..998fb8ec7 100644--- a/web/js/util/util.js+++ b/web/js/util/util.js@@ -803,6 +803,7 @@ export default (function(selfObj) {* @param {*} scripts* @param {*} fn*/+ // eslint-disable-next-line default-param-lastself.loadScripts = (scripts = [], fn) => {const head = document.head || document.getElementsByTagName('head')[0];const loadFile = (index) => {