Interactive interface for browsing global, full-resolution satellite imagery
add disableUnitConversion in measurements config, translate key into layer defs, check where temp units are converted to prevent if present
Jason Kent74c697eb7222
diff --git a/config/default/common/config/wv.json/measurements/Brightness Temperature.json b/config/default/common/config/wv.json/measurements/Brightness Temperature.jsonindex 88863b19f..e63bac7d7 100644--- a/config/default/common/config/wv.json/measurements/Brightness Temperature.json+++ b/config/default/common/config/wv.json/measurements/Brightness Temperature.json@@ -3,6 +3,7 @@"Brightness Temperature": {"id": "brightness-temperature","title": "Brightness Temperature",+ "disableUnitConversion": true,"subtitle": "Aqua/AMSR-E, Aqua/MODIS, Terra/MODIS, GCOM-W1/AMSR2, GPM/GMI, NOAA-20/VIIRS, NOAA-20/VIIRS+CrIS, TRMM, SMAP/Radar/Radiometer, Suomi NPP/VIIRS, Suomi NPP/VIIRS+CrIS, NOAA-15/AMSU-A, NOAA-16/AMSU-A, NOAA-17/AMSU-A","sources": {"Aqua/AMSR-E": {diff --git a/web/js/components/layer/settings/layer-settings.js b/web/js/components/layer/settings/layer-settings.jsindex 1f8c7bd1c..6edc812a1 100644--- a/web/js/components/layer/settings/layer-settings.js+++ b/web/js/components/layer/settings/layer-settings.js@@ -1,6 +1,6 @@import React from 'react';import PropTypes from 'prop-types';-import { each as lodashEach } from 'lodash';+import { each as lodashEach, get as lodashGet } from 'lodash';import {TabContent, TabPane, Nav, NavItem, NavLink,} from 'reactstrap';@@ -313,7 +313,7 @@ function mapStateToProps(state, ownProps) {} = state;const { custom } = palettes;const groupName = compare.activeString;- const { globalTemperatureUnit } = globalUnit;+ const globalTemperatureUnit = lodashGet(ownProps, 'layer.disableUnitConversion') ? '' : globalUnit.globalTemperatureUnit;return {paletteOrder: config.paletteOrder,groupName,diff --git a/web/js/components/vector-metadata/table.js b/web/js/components/vector-metadata/table.jsindex c90ea2d26..21b5d59de 100644--- a/web/js/components/vector-metadata/table.js+++ b/web/js/components/vector-metadata/table.js@@ -44,13 +44,16 @@ export default class VectorMetaTable extends React.Component {let description = properties.Description;let unit = properties.Units;if (value && unit) {+ const { disableUnitConversion } = obj;const initialUnit = unit;unit = getAbbrevFromTemperatureUnit(unit) || unit;- const { needsConversion, legendTempUnit } = checkTemperatureUnitConversion(unit, globalTemperatureUnit);- if (needsConversion) {- value = `${convertPaletteValue(`${value}`, legendTempUnit, globalTemperatureUnit)}`;- description = description.replace(initialUnit, globalTemperatureUnit);- unit = '';+ if (!disableUnitConversion) {+ const { needsConversion, legendTempUnit } = checkTemperatureUnitConversion(unit, globalTemperatureUnit);+ if (needsConversion) {+ value = `${convertPaletteValue(`${value}`, legendTempUnit, globalTemperatureUnit)}`;+ description = description.replace(initialUnit, globalTemperatureUnit);+ unit = '';+ }}}diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.jsindex aa817dd08..b9318ef12 100644--- a/web/js/containers/sidebar/layer-row.js+++ b/web/js/containers/sidebar/layer-row.js@@ -349,7 +349,7 @@ const makeMapStateToProps = () => {} = state;const isMobile = browser.lessThan.medium;const { isDistractionFreeModeActive } = ui;- const { globalTemperatureUnit } = globalUnit;+ const globalTemperatureUnit = lodashGet(ownProps, 'layer.disableUnitConversion') ? '' : globalUnit.globalTemperatureUnit;const hasPalette = !lodashIsEmpty(layer.palette);const renderedPalettes = palettes.rendered;const paletteName = lodashGet(config, `layers['${layer.id}'].palette.id`);diff --git a/web/js/main.js b/web/js/main.jsindex 42ba3d302..ecd96fdf2 100644--- a/web/js/main.js+++ b/web/js/main.js@@ -35,6 +35,7 @@ import {adjustEndDates,adjustActiveDateRanges,adjustStartDates,+ adjustMeasurementsValidUnitConversion,mockFutureTimeLayerOptions,} from './modules/layers/util';import { debugConfig } from './debug';@@ -185,6 +186,9 @@ window.onload = () => {mockFutureTimeLayerOptions(config.layers, parameters.mockFutureLayer);}adjustEndDates(config.layers);++ // handle checking measurements to prevent unit conversion+ adjustMeasurementsValidUnitConversion(config);// Remove any mock storiesif (!parameters.mockTour) {Object.keys(config.stories).forEach((storyId) => {diff --git a/web/js/modules/layers/util.js b/web/js/modules/layers/util.jsindex f5e96f688..92372214c 100644--- a/web/js/modules/layers/util.js+++ b/web/js/modules/layers/util.js@@ -1516,3 +1516,20 @@ export function getLayersFromGroups (state, groups) {.concat(baselayers): [];}++export function adjustMeasurementsValidUnitConversion(config) {+ const { measurements, layers } = config;+ const applyDisableUnitConversionCheck = (layer) => {+ const { layergroup } = layer;+ if (!layergroup || !measurements[layergroup]) {+ return;+ }++ const { disableUnitConversion } = measurements[layergroup];+ if (disableUnitConversion) {+ layer.disableUnitConversion = true;+ }+ };++ return Object.values(layers).forEach(applyDisableUnitConversionCheck);+}diff --git a/web/js/modules/vector-styles/util.js b/web/js/modules/vector-styles/util.jsindex ede9772c4..c3a957106 100644--- a/web/js/modules/vector-styles/util.js+++ b/web/js/modules/vector-styles/util.js@@ -262,6 +262,7 @@ function getModalContentsAtPixel(mapProps, config, compareState, isMobile) {title: def.title || layerId,subTitle: def.subtitle,featureTitle: title,+ disableUnitConversion: !!def.disableUnitConversion,};metaArray.push(obj);