Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

make sure sources get filtered by projection

Jason Kent9fd3b413874d
diff --git a/web/js/components/layer/product-picker/browse/category-layer-row.js b/web/js/components/layer/product-picker/browse/category-layer-row.js
index 4f837b5d6..cf15d6084 100644
--- a/web/js/components/layer/product-picker/browse/category-layer-row.js
+++ b/web/js/components/layer/product-picker/browse/category-layer-row.js
@@ -16,6 +16,7 @@ import {
selectSource as selectSourceAction,
selectMeasurement as selectMeasurementAction,
} from '../../../../modules/product-picker/actions';
+import { getSourcesForProjection } from '../../../../modules/product-picker/selectors';
import {
hasMeasurementSetting as hasSettingSelector,
} from '../../../../modules/layers/selectors';
@@ -52,7 +53,6 @@ class CategoryLayerRow extends React.Component {
const {
layerConfig,
measurement,
- projection,
} = this.props;
const OrbitSourceList = [];
const LayerSouceList = [];
@@ -60,11 +60,6 @@ class CategoryLayerRow extends React.Component {
source.settings.forEach((layerId) => {
const layer = layerConfig[layerId];
- const inProjection = Object.keys(layer.projections).indexOf(projection) > -1;
-
- if (!layer || layer.id !== layerId || !inProjection) {
- return;
- }
if (layer.layergroup === 'Orbital Track') {
orbitTitle = getOrbitTrackTitle(layer);
@@ -145,9 +140,9 @@ class CategoryLayerRow extends React.Component {
hasMeasurementSetting,
measurement,
isMobile,
+ sources,
selectedMeasurementSourceIndex,
} = this.props;
- const sources = Object.values(measurement.sources);
// set first valid index to handle invalid activeSourceIndex indexes after projection change
let minValidIndex = -1;
@@ -232,11 +227,11 @@ CategoryLayerRow.propTypes = {
isSelected: PropTypes.bool,
layerConfig: PropTypes.object,
measurement: PropTypes.object,
- projection: PropTypes.string,
selectSource: PropTypes.func,
selectMeasurement: PropTypes.func,
selectedMeasurement: PropTypes.string,
selectedMeasurementSourceIndex: PropTypes.number,
+ sources: PropTypes.array,
};
const mapStateToProps = (state) => {
@@ -252,11 +247,13 @@ const mapStateToProps = (state) => {
selectedMeasurementSourceIndex,
categoryType,
} = productPicker;
+
return {
categoryType,
layerConfig: config.layers,
isMobile,
projection: proj.id,
+ sources: getSourcesForProjection(state),
selectedMeasurement,
selectedMeasurementSourceIndex,
hasMeasurementSetting: (current, source) => hasSettingSelector(current, source, config, proj.id),
diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
index c13289c86..94762e3b9 100644
--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { getMeasurementSource } from '../../../../modules/product-picker/selectors';
+import { getSourcesForProjection } from '../../../../modules/product-picker/selectors';
import LayerInfo from '../../info/info';
function MeasurementMetadataDetail (props) {
@@ -150,8 +150,10 @@ const mapStateToProps = (state) => {
const {
productPicker, layers, config, proj,
} = state;
- const source = getMeasurementSource(state);
- const { category } = productPicker;
+
+ const { category, selectedMeasurementSourceIndex } = productPicker;
+ const sources = getSourcesForProjection(state);
+ const source = sources && sources[selectedMeasurementSourceIndex];
const { layerConfig } = layers;
const settings = source ? source.settings : [];
const layersForSource = settings.map((id) => layerConfig[id]);
diff --git a/web/js/modules/product-picker/selectors.js b/web/js/modules/product-picker/selectors.js
index 133e7455e..336de598b 100644
--- a/web/js/modules/product-picker/selectors.js
+++ b/web/js/modules/product-picker/selectors.js
@@ -34,14 +34,19 @@ export const getLayersForProjection = createSelector(
},
);
-export const getMeasurementSource = createSelector(
- [getConfig, getProductPicker],
- (config, { selectedMeasurement, selectedMeasurementSourceIndex }) => {
+export const getSourcesForProjection = createSelector(
+ [getConfig, getProjection, getProductPicker],
+ (config, projection, { selectedMeasurement, selectedMeasurementSourceIndex }) => {
const measurements = Object.values(config.measurements);
const currentMeasurement = measurements.find(({ id }) => id === selectedMeasurement);
const sources = currentMeasurement && Object.values(currentMeasurement.sources);
- const sortedSources = sources && sources.sort((a, b) => a.title.localeCompare(b.title));
- return sortedSources && sortedSources[selectedMeasurementSourceIndex];
+ const sourcesForProj = sources && sources.filter(
+ (source) => source.settings.some((layerId) => {
+ const { projections, layergroup } = config.layers[layerId];
+ return !!projections[projection] && layergroup !== 'Orbital Track';
+ }),
+ );
+ return sourcesForProj && sourcesForProj.sort((a, b) => a.title.localeCompare(b.title));
},
);