Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-1995: Prioritize References measurement group in Layer List (#4002)

Ryan Weiler90b8d338473d
diff --git a/e2e/features/image-download/layers-test.js b/e2e/features/image-download/layers-test.js
index bd3d5286b..937104ea2 100644
--- a/e2e/features/image-download/layers-test.js
+++ b/e2e/features/image-download/layers-test.js
@@ -16,7 +16,7 @@ module.exports = {
},
'List layers in draw order': function(c) {
- bookmark(c, startParams.concat(['l=MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Features_15m,MODIS_Terra_Aerosol']));
+ bookmark(c, startParams.concat(['l=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol,Reference_Features_15m']));
openImageDownloadPanel(c);
clickDownload(c);
c.expect.element('#wv-image-download-url').to.have.attribute('url')
@@ -28,7 +28,7 @@ module.exports = {
openImageDownloadPanel(c);
clickDownload(c);
c.expect.element('#wv-image-download-url').to.have.attribute('url')
- .and.to.contain('LAYERS=MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Features_15m,MODIS_Terra_Aerosol');
+ .and.to.contain('LAYERS=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol,Reference_Features_15m');
},
'Do not include obscured layers': function(c) {
diff --git a/e2e/features/layers/layers-sidebar-test.js b/e2e/features/layers/layers-sidebar-test.js
index fe9aa8ae1..600d16f4a 100644
--- a/e2e/features/layers/layers-sidebar-test.js
+++ b/e2e/features/layers/layers-sidebar-test.js
@@ -52,11 +52,11 @@ const groupedLayerIdOrder = [
'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
];
const ungroupedReorderdLayerIdOrder = [
- 'active-MODIS_Combined_Value_Added_AOD',
- 'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
+ 'active-Reference_Features_15m',
'active-VIIRS_SNPP_Thermal_Anomalies_375m_All',
'active-VIIRS_NOAA20_Thermal_Anomalies_375m_All',
- 'active-Reference_Features_15m',
+ 'active-MODIS_Combined_Value_Added_AOD',
+ 'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
];
module.exports = {
diff --git a/web/js/modules/layers/actions.test.js b/web/js/modules/layers/actions.test.js
index b76f2013c..57ca98d71 100644
--- a/web/js/modules/layers/actions.test.js
+++ b/web/js/modules/layers/actions.test.js
@@ -64,10 +64,10 @@ describe('Layer actions', () => {
});
test('REMOVE_LAYER action removes layer by id', () => {
- const def = layers[0];
+ const def = layers[1];
store.dispatch(removeLayer('aqua-aod'));
const actionResponse = store.getActions()[0];
- const responseLayers = [layers[1], layers[2], layers[3]];
+ const responseLayers = [layers[0], layers[2], layers[3]];
const expectedPayload = {
type: LAYER_CONSTANTS.REMOVE_LAYER,
@@ -92,8 +92,8 @@ describe('Layer actions', () => {
const expectedPayload = {
type: LAYER_CONSTANTS.REMOVE_GROUP,
activeString: 'active',
- layersToRemove: [layers[0], layers[1]],
- layers: [layers[2], layers[3]],
+ layersToRemove: [layers[1], layers[2]],
+ layers: [layers[0], layers[3]],
granuleLayers: {},
};
expect(actionResponse).toEqual(expectedPayload);
@@ -106,7 +106,7 @@ describe('Layer actions', () => {
type: LAYER_CONSTANTS.TOGGLE_OVERLAY_GROUPS,
activeString: 'active',
groupOverlays: false,
- layers,
+ layers: [layers[1], layers[2], layers[0], layers[3]],
overlayGroups: [],
};
expect(actionResponse).toEqual(expectedPayload);
@@ -117,7 +117,7 @@ describe('Layer actions', () => {
store = mockStore(getState(layers));
store.dispatch(updateDatesOnProjChange('arctic'));
const actionResponse = store.getActions()[0];
- const { startDate, endDate, dateRanges: [firstRange, secondRange] } = actionResponse.layersA[0];
+ const { startDate, endDate, dateRanges: [firstRange, secondRange] } = actionResponse.layersA[1];
expect(startDate).toEqual('2019-07-21T00:36:00Z');
expect(endDate).toEqual('2019-09-24T22:30:00Z');
diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.js
index 6a7111e7b..12b335150 100644
--- a/web/js/modules/layers/selectors.js
+++ b/web/js/modules/layers/selectors.js
@@ -308,10 +308,26 @@ export function addLayer(id, spec = {}, layersParam, layerConfig, overlayLength,
if (def.group === 'overlays') {
// TODO assuming first group in the array again here
const groupIdx = layers.findIndex(({ layergroup }) => layergroup === def.layergroup);
+
+ const findLastRefLayer = (layers) => {
+ let lastRefIndex = 0;
+ let index = 0;
+
+ layers.forEach((layer) => {
+ if (layer.layergroup === 'Reference') {
+ lastRefIndex = index;
+ }
+ index += 1;
+ });
+ return lastRefIndex + 1;
+ };
+
+ const lastReferenceLayerIndex = findLastRefLayer(layers);
+
if (groupOverlays && groupIdx >= 0) {
layers.splice(groupIdx, 0, def);
} else {
- layers.unshift(def);
+ layers.splice(lastReferenceLayerIndex, 0, def);
}
} else {
const overlaysLength = overlayLength || layers.filter((layer) => layer.group === 'overlays').length;
diff --git a/web/js/modules/layers/selectors.test.js b/web/js/modules/layers/selectors.test.js
index b68a1f0ca..bae53f055 100644
--- a/web/js/modules/layers/selectors.test.js
+++ b/web/js/modules/layers/selectors.test.js
@@ -33,7 +33,7 @@ test('adds base layer', () => {
const layerList = getLayers(getState(layers), {}).map((x) => x.id);
- expect(layerList).toEqual(['mask', 'terra-cr', 'terra-aod']);
+ expect(layerList).toEqual(['terra-cr', 'mask', 'terra-aod']);
});
test('adds overlay layer', () => {
diff --git a/web/js/modules/layers/util.test.js b/web/js/modules/layers/util.test.js
index 9d99fa665..9f5d8768b 100644
--- a/web/js/modules/layers/util.test.js
+++ b/web/js/modules/layers/util.test.js
@@ -30,37 +30,37 @@ test('Layer parser, retrieves correct number of palette layers from permalink st
});
test('Layer parser, gets correct palette layer ID', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.id).toBe('AMSRE_Brightness_Temp_89H_Night');
});
test('Layer parser, gets correct custom palette id from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.custom[0]).toBe('red_2');
});
test('Layer parser, gets squashed boolean from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.squash[0]).toBe(true);
});
test('Layer parser, gets correct min value from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.min[0]).toBe(224);
});
test('Layer parser, gets correct max value from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.max[0]).toBe(294);
});
test('Layer parser, gets correct max value from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.opacity).toBe(0.54);
});
test('Layer parser, retrieves hidden palette layer from permalink string', () => {
const layers = layersParse12(PALETTE_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.opacity).toBe(0.54);
});
test('Layer parser, retrieves correct number of vector layers from permalink string', () => {
@@ -69,17 +69,17 @@ test('Layer parser, retrieves correct number of vector layers from permalink str
});
test('Layer parser, gets correct vector layer ID', () => {
const layers = layersParse12(VECTOR_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.id).toBe('OrbitTracks_Aqua_Ascending');
});
test('Layer parser, gets correct custom vector style id from permalink string', () => {
const layers = layersParse12(VECTOR_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.custom[0]).toBe('yellow1');
});
test('Layer parser, retrieves hidden vector layer from permalink string', () => {
const layers = layersParse12(VECTOR_LAYER_STRING, config);
- const layer = layers[0];
+ const layer = layers[1];
expect(layer.opacity).toBe(0.46);
});
test('serialize layers and palettes', () => {
diff --git a/web/js/modules/palettes/util.test.js b/web/js/modules/palettes/util.test.js
index 96d3f9d62..36b96029d 100644
--- a/web/js/modules/palettes/util.test.js
+++ b/web/js/modules/palettes/util.test.js
@@ -90,11 +90,12 @@ describe('permalink 1.1', () => {
const layer1 = stateFromLocation.layers.active.layers[0];
const layer2 = stateFromLocation.layers.active.layers[1];
- expect(layer1.id).toBe('terra-aod');
- expect(layer1.custom).toBe('blue-1');
- expect(layer2.id).toBe('aqua-aod');
- expect(layer2.custom).toBe('red-1');
+ expect(layer1.id).toBe('aqua-aod');
+ expect(layer1.custom).toBe('red-1');
+
+ expect(layer2.id).toBe('terra-aod');
+ expect(layer2.custom).toBe('blue-1');
});
test('disregard palettes value if palette assigned to a layer that is not active', () => {