Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

wv-2836 satellite names (#4638)

Tom Cariello4cbf37e85b55
diff --git a/web/js/components/layer/product-picker/renderSplitTitle.js b/web/js/components/layer/product-picker/renderSplitTitle.js
index fb729f6fc..6707e6b79 100644
--- a/web/js/components/layer/product-picker/renderSplitTitle.js
+++ b/web/js/components/layer/product-picker/renderSplitTitle.js
@@ -11,7 +11,7 @@ export default function RenderSplitLayerTitle(props) {
const { layer } = props;
const { title, subtitle } = layer;
const layerIsOrbitTrack = layer.layergroup === 'Orbital Track';
- const layerTitle = !layerIsOrbitTrack ? title : `${title} (${getOrbitTrackTitle(layer)})`;
+ const layerTitle = !layerIsOrbitTrack ? title : `${title} (${getOrbitTrackTitle(layer, false)})`;
let splitIdx;
let attrs;
let titleName;
diff --git a/web/js/components/layer/settings/associated-layers-toggle.js b/web/js/components/layer/settings/associated-layers-toggle.js
index 1fe50cb08..68b1763ce 100644
--- a/web/js/components/layer/settings/associated-layers-toggle.js
+++ b/web/js/components/layer/settings/associated-layers-toggle.js
@@ -32,7 +32,6 @@ function AssociatedLayersToggle(props) {
<h2 className="wv-header"> Associated Layers </h2>
{ associatedLayers.map((layer) => {
const { id } = layer;
- const satelliteName = layer.title.split(' - ')[0];
const isEnabled = !!activeLayers[id];
const onCheck = () => (isEnabled ? removeLayer(id) : addLayer(id));
return (
@@ -42,7 +41,7 @@ function AssociatedLayersToggle(props) {
title="Enable/disable this layer"
checked={isEnabled}
onCheck={onCheck}
- label={`${getTitle(layer)} (${satelliteName})`}
+ label={getTitle(layer)}
/>
);
}) }
diff --git a/web/js/containers/sidebar/orbit-track.js b/web/js/containers/sidebar/orbit-track.js
index 87450bd06..3719955cb 100644
--- a/web/js/containers/sidebar/orbit-track.js
+++ b/web/js/containers/sidebar/orbit-track.js
@@ -27,7 +27,6 @@ function OrbitTrack(props) {
const containerClasses = `wv-orbit-track ${!trackLayer.visible ? 'not-visible' : ''}`;
const [palette, setPalette] = useState();
- const satelliteName = trackLayer.title.split(' - ')[0];
useEffect(() => {
if (hasPalette && !isLoading && !renderedPalette) {
@@ -51,7 +50,7 @@ function OrbitTrack(props) {
{palette}
<FontAwesomeIcon icon="satellite" />
<span className="wv-orbit-track-label">
- {`${getOrbitTrackTitle(trackLayer)} (${satelliteName})`}
+ {getOrbitTrackTitle(trackLayer)}
</span>
</div>
);
diff --git a/web/js/modules/layers/util.js b/web/js/modules/layers/util.js
index c873e6c68..7765c416e 100644
--- a/web/js/modules/layers/util.js
+++ b/web/js/modules/layers/util.js
@@ -24,15 +24,22 @@ import { getVectorStyleAttributeArray } from '../vector-styles/util';
import util from '../../util/util';
import { parseDate } from '../date/util';
-export function getOrbitTrackTitle(def) {
+/**
+ * Given a layer definition, returns formatted string
+ * @param {object} def | Layer definition
+ * @param {bool} includeSatName | Optionally exclude the satellite name from the output
+ * @return {string}
+ */
+export function getOrbitTrackTitle(def, includeSatName = true) {
+ const satelliteName = includeSatName ? ` (${def.title.split(' - ')[0]})` : '';
const { track } = def;
const daynightValue = lodashGet(def, 'daynight[0]');
if (track && daynightValue) {
- return `${lodashStartCase(track)}/${lodashStartCase(daynightValue)}`;
+ return `${lodashStartCase(track)}/${lodashStartCase(daynightValue)}${satelliteName}`;
} if (track) {
- return lodashStartCase(track);
+ return `${lodashStartCase(track)}${satelliteName}`;
} if (daynightValue) {
- return lodashStartCase(daynightValue);
+ return `${lodashStartCase(daynightValue)}${satelliteName}`;
}
}