Interactive interface for browsing global, full-resolution satellite imagery
dry up
Ed Platob24463c40acc
diff --git a/web/js/components/global-settings/global-settings.js b/web/js/components/global-settings/global-settings.jsindex c502ba051..b06f4a9e2 100644--- a/web/js/components/global-settings/global-settings.js+++ b/web/js/components/global-settings/global-settings.js@@ -6,28 +6,22 @@ import {changeTemperatureUnit,} from '../../modules/global-unit/actions';-class GlobalSettings extends React.Component {- constructor(props) {- super(props);- this.state = {};- }+function GlobalSettings(props) {+ const {+ globalTemperatureUnit,+ changeTemperatureUnitAction,+ } = props;- render() {- const {- globalTemperatureUnit,- changeTemperatureUnitAction,- } = this.props;- return (- <div>- <div className="global-setting-container">- <TemperatureUnitButtons- globalTemperatureUnit={globalTemperatureUnit}- changeTemperatureUnit={changeTemperatureUnitAction}- />- </div>+ return (+ <>+ <div className="global-setting-container">+ <TemperatureUnitButtons+ globalTemperatureUnit={globalTemperatureUnit}+ changeTemperatureUnit={changeTemperatureUnitAction}+ /></div>- );- }+ </>+ );}function mapStateToProps(state) {diff --git a/web/js/components/global-settings/temperature-unit-buttons.js b/web/js/components/global-settings/temperature-unit-buttons.jsindex 4a991df03..3c0c7b79a 100644--- a/web/js/components/global-settings/temperature-unit-buttons.js+++ b/web/js/components/global-settings/temperature-unit-buttons.js@@ -1,38 +1,24 @@import React from 'react';import PropTypes from 'prop-types';import { Button, ButtonGroup } from 'reactstrap';+import { TEMPERATURE_UNITS } from '../../modules/global-unit/constants';const TemperatureUnitButtons = ({ globalTemperatureUnit, changeTemperatureUnit }) => (<div className="temperature-unit-buttons settings-component"><h3 className="wv-header">Temperature Unit</h3><ButtonGroup>- <Button- aria-label="Set Kelvin Unit"- outline- className="temperature-unit-button"- active={globalTemperatureUnit === 'Kelvin'}- onClick={() => changeTemperatureUnit('Kelvin')}- >- Kelvin- </Button>- <Button- aria-label="Set Celsius Unit"- outline- className="temperature-unit-button"- active={globalTemperatureUnit === 'Celsius'}- onClick={() => changeTemperatureUnit('Celsius')}- >- Celsius- </Button>- <Button- aria-label="Set Fahrenheit Unit"- outline- className="temperature-unit-button"- active={globalTemperatureUnit === 'Fahrenheit'}- onClick={() => changeTemperatureUnit('Fahrenheit')}- >- Fahrenheit- </Button>+ {TEMPERATURE_UNITS.map((unit) => (+ <Button+ key={`${unit}-button`}+ aria-label={`Set ${unit} Unit`}+ outline+ className="temperature-unit-button"+ active={globalTemperatureUnit === unit}+ onClick={() => changeTemperatureUnit(unit)}+ >+ {unit}+ </Button>+ ))}<Buttonaria-label="Reset to Default Unit"outline@@ -40,7 +26,7 @@ const TemperatureUnitButtons = ({ globalTemperatureUnit, changeTemperatureUnit }active={!globalTemperatureUnit}onClick={() => changeTemperatureUnit('')}>- Default+ Defaults</Button></ButtonGroup></div>diff --git a/web/js/modules/global-unit/constants.js b/web/js/modules/global-unit/constants.jsindex f7e3c24fa..8ef4845ce 100644--- a/web/js/modules/global-unit/constants.js+++ b/web/js/modules/global-unit/constants.js@@ -1,2 +1,3 @@// eslint-disable-next-line import/prefer-default-exportexport const CHANGE_TEMPERATURE_UNIT = 'GLOBAL_UNIT/CHANGE_TEMPERATURE_UNIT';+export const TEMPERATURE_UNITS = ['Kelvin', 'Celsius', 'Fahrenheit'];diff --git a/web/js/modules/global-unit/util.js b/web/js/modules/global-unit/util.jsindex 80ba8dabe..f1f29c242 100644--- a/web/js/modules/global-unit/util.js+++ b/web/js/modules/global-unit/util.js@@ -42,6 +42,28 @@ export function checkTemperatureUnitConversion(units, globalTemperatureUnit) {};}+/**+ * Parse prefix and value or use defaults+ *+ * @param {String} val (ex: '≥ 32.00')+ * @returns {Array - Strings} prefix, value+ */+const getPrefixAndValue = (val) => {+ let prefix = '';+ let value = val;+ const valSplit = val.split(' ');++ if (valSplit.length > 1) {+ [prefix, value] = valSplit;+ prefix = `${prefix} `;+ }++ return [+ prefix,+ value,+ ];+};+/*** Convert palette temperature values based on units*@@ -67,9 +89,9 @@ export function checkTemperatureUnitConversion(units, globalTemperatureUnit) {** @returns {String} converted unit (ex: '39.02 – 39.29 °F')*/+export function convertPaletteValue(val, initialUnit, targetUnit) {const newUnitAbbrev = getAbbrevFromTemperatureUnit(targetUnit || initialUnit);- let prefix = '';let convertedValue;const isDash = val.includes(' – ');const splitCharacter = isDash@@ -78,35 +100,19 @@ export function convertPaletteValue(val, initialUnit, targetUnit) {// Range value (ex: '186.2 – 186.9')if (splitCharacter) {- let [minRangeVal, maxRangeVal] = val.split(` ${splitCharacter} `);+ const [minRangeVal, maxRangeVal] = val.split(` ${splitCharacter} `);- let minPrefix = '';- let maxPrefix = '';- const minRangeSplit = minRangeVal.split(' ');- const maxRangeSplit = maxRangeVal.split(' ');- if (minRangeSplit.length > 1) { // (ex: '< 180.0')- [minPrefix, minRangeVal] = minRangeSplit;- minPrefix = `${minPrefix} `;- }- if (maxRangeSplit.length > 1) {- [maxPrefix, maxRangeVal] = maxRangeSplit;- maxPrefix = `${maxPrefix} `;- }+ const [minPrefix, minValue] = getPrefixAndValue(minRangeVal);+ const [maxPrefix, maxValue] = getPrefixAndValue(maxRangeVal);- const minConvert = unitConvert(Number(minRangeVal), initialUnit, targetUnit).toFixed(2);- const maxConvert = unitConvert(Number(maxRangeVal), initialUnit, targetUnit).toFixed(2);+ const minConvert = unitConvert(Number(minValue), initialUnit, targetUnit).toFixed(2);+ const maxConvert = unitConvert(Number(maxValue), initialUnit, targetUnit).toFixed(2);convertedValue = `${minPrefix}${minConvert} ${splitCharacter} ${maxPrefix}${maxConvert} ${newUnitAbbrev}`;} else {// Single value (ex: '180.0', '< 180.0')- const valSplit = val.split(' ');- let singleVal = val;- if (valSplit.length > 1) { // (ex: '< 180.0')- [prefix, singleVal] = valSplit;- prefix = `${prefix} `;- }-- const valConvert = unitConvert(Number(singleVal), initialUnit, targetUnit).toFixed(2);- convertedValue = `${prefix}${valConvert} ${newUnitAbbrev}`;+ const [prefix, value] = getPrefixAndValue(val);+ const valueConvert = unitConvert(Number(value), initialUnit, targetUnit).toFixed(2);+ convertedValue = `${prefix}${valueConvert} ${newUnitAbbrev}`;}return convertedValue;}