Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
davidlstarr committed Oct 17, 2023
1 parent f58c462 commit 478f02d
Show file tree
Hide file tree
Showing 2 changed files with 161 additions and 122 deletions.
135 changes: 13 additions & 122 deletions src/js/components/sharedComponents/IntegratedAlertControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,18 @@ import { useDispatch, useSelector } from 'react-redux';
import { RootState } from '../../store';
import * as React from 'react';
import { DATE_PICKER_START_DATES, LAYER_IDS } from '../../../../configs/layer-config';
import { format } from 'date-fns';
import { mapController } from '../../controllers/mapController';
import { LayerFactory } from '../../helpers/LayerFactory';
import {
setIntegratedAlertLayerEnd,
setIntegratedAlertLayerStart,
setHighConfidenceConfirmed,
setGladStart,
setGladEnd,
setGlad2Start,
setGlad2End,
setRaddAlertEnd,
setRaddAlertStart,
} from '../../store/appState/actions';
import { setHighConfidenceConfirmed } from '../../store/appState/actions';
import { layerControlsTranslations } from '../../../../configs/translations/leftPanel.translations';
import DatePicker from 'react-datepicker';
import styled from 'styled-components';
import {
onEndDateChange,
onStartDateChange,
showGeographicCoverage,
handleDateToggle,
} from './helpers/IntegratedAlertControlsHelper';

//Dynamic custom theme override using styled-components lib
interface CheckBoxWrapperProps {
Expand All @@ -40,26 +35,12 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
const dispatch = useDispatch();
const highConfidenceConfirmed = useSelector((store: RootState) => store.appState.leftPanel.highConfidenceConfirmed);
const geographicCoverage = useSelector((store: RootState) => store.appState.leftPanel.geographicCoverage);

const gfwIntegratedStart = useSelector((store: RootState) => store.appState.leftPanel.gfwIntegratedStart);

const gfwIntegratedEnd = useSelector((store: RootState) => store.appState.leftPanel.gfwIntegratedEnd);
const integratedAlertLayer = useSelector((store: RootState) => store.appState.leftPanel.integratedAlertLayer);

const gladStart = useSelector((store: RootState) => store.appState.leftPanel.gladStart);
const gladEnd = useSelector((store: RootState) => store.appState.leftPanel.gladEnd);

const glad2Start = useSelector((store: RootState) => store.appState.leftPanel.glad2Start);
const glad2End = useSelector((store: RootState) => store.appState.leftPanel.glad2End);

const raddAlertStart = useSelector((store: RootState) => store.appState.leftPanel.raddAlertStart);
const raddAlertEnd = useSelector((store: RootState) => store.appState.leftPanel.raddAlertEnd);

const [startDate, setStartDate] = React.useState(String(DATE_PICKER_START_DATES.GFW_INTEGRATED_ALERTS));
const [startDateUnformatted, setStartDateUnformatted] = React.useState(
String(DATE_PICKER_START_DATES.GFW_INTEGRATED_ALERTS)
);
const [endDateUnformatted, setEndDateUnformatted] = React.useState(gfwIntegratedEnd);
const [endDate, setEndDate] = React.useState(gfwIntegratedEnd);

async function handleStartDateChange(day: any) {
Expand All @@ -72,30 +53,7 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
setStartDate(dFormat);
setStartDateUnformatted(day);

//@ts-ignore
const start = new Date(dFormat).getJulian();
//@ts-ignore
const end = new Date(endDate).getJulian();

if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
await mapController.toggleGladLayer({ id: LAYER_IDS.GFW_INTEGRATED_ALERTS, start, end });

dispatch(setIntegratedAlertLayerStart(dFormat));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_ALERTS, start, end });

const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_ALERTS);
selectedLayer.visible = true;
dispatch(setGladStart(dFormat));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
dispatch(setGlad2Start(dFormat));

await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_S2_ALERTS, start, end });
} else if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
dispatch(setRaddAlertStart(dFormat));

await mapController.toggleGladLayer({ id: LAYER_IDS.RADD_ALERTS, start, end });
}
onStartDateChange(dFormat, endDate);
}

async function handleEndDateChange(day: any) {
Expand All @@ -106,39 +64,8 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
const dFormat = date;

setEndDate(dFormat);
setEndDateUnformatted(day);
//@ts-ignore
const end = new Date(dFormat).getJulian();
let start;

if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
//@ts-ignore
start = new Date(gfwIntegratedStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GFW_INTEGRATED_ALERTS, start, end });

dispatch(setIntegratedAlertLayerEnd(date));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
//@ts-ignore

start = new Date(gladStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_ALERTS, start, end });

const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_ALERTS);
selectedLayer.visible = true;
dispatch(setGladEnd(date));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
dispatch(setGlad2End(date));

//@ts-ignore
start = new Date(glad2Start).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_S2_ALERTS, start, end });
} else if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
dispatch(setRaddAlertEnd(date));
//@ts-ignore

start = new Date(raddAlertStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.RADD_ALERTS, start, end });
}
onEndDateChange(date);
}

async function showOnlyHighConfidenceToggle() {
Expand All @@ -150,51 +77,14 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
mapController._map?.add(gfwIntegratedLayerNew);
}

async function showGeographicCoverage() {
if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GFW_INTEGRATED_ALERTS);
selectedLayer.visible = true;
}

if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_ALERTS);
selectedLayer.visible = true;
}

if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_S2_ALERTS);
selectedLayer.visible = true;
}

if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.RADD_ALERTS);
selectedLayer.visible = true;
}
}

const handleDateToggle = () => {
if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
return { start: gfwIntegratedStart, end: gfwIntegratedEnd };
}
if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
return { start: glad2Start, end: glad2End };
}
if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
return { start: gladStart, end: gladEnd };
}
if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
return { start: raddAlertStart, end: raddAlertEnd };
}
return { start: startDate, end: endDate };
};

return (
<div className="glad-control-wrapper">
<>
<div className="glad-control-container">
<div className="layer-checkbox">
<CheckboxWrapper customColorTheme={props.customColorTheme}>
<input
title="High and Highest Confidence Alerts"
type="checkbox"
name="styled-checkbox"
className="styled-checkbox"
Expand All @@ -211,6 +101,7 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
<div className="layer-checkbox">
<CheckboxWrapper customColorTheme={props.customColorTheme}>
<input
title="Geographic Coverage"
type="checkbox"
name="styled-checkbox"
className="styled-checkbox"
Expand All @@ -234,7 +125,7 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
dropdownMode="select"
placeholderText="select a day"
onChange={(date) => handleStartDateChange(date)}
selected={new Date(handleDateToggle()?.start)}
selected={new Date(handleDateToggle(startDate, endDate)?.start)}
minDate={new Date(DATE_PICKER_START_DATES.GFW_INTEGRATED_ALERTS)}
maxDate={new Date(endDate)}
/>
Expand All @@ -247,7 +138,7 @@ const IntegratedAlertControls = (props: GladControlsProps): JSX.Element => {
dropdownMode="select"
placeholderText="select a day"
onChange={(date) => handleEndDateChange(date)}
selected={new Date(handleDateToggle().end)}
selected={new Date(handleDateToggle(startDate, endDate).end)}
minDate={new Date(startDateUnformatted)}
maxDate={new Date()}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
import { LAYER_IDS } from '../../../../../configs/layer-config';
import { loadModules } from 'esri-loader';
import { mapController } from '../../../controllers/mapController';
import { createGladS2Layer } from '../../../layers/GladS2Layer';
import { createRadd } from '../../../layers/RaddLayer';
import store from '../../../../../src/js/store';
import {
setGeographicCoverage,
setGlad2End,
setGlad2Start,
setGladEnd,
setGladStart,
setIntegratedAlertLayerEnd,
setIntegratedAlertLayerStart,
setRaddAlertEnd,
setRaddAlertStart,
} from '../../../store/appState/actions';

export const onStartDateChange = async (dFormat: any, endDate: any) => {
const integratedAlertLayer = store.getState().appState.leftPanel.integratedAlertLayer;

//@ts-ignore
const start = new Date(dFormat).getJulian();
//@ts-ignore
const end = new Date(endDate).getJulian();

if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
await mapController.toggleGladLayer({ id: LAYER_IDS.GFW_INTEGRATED_ALERTS, start, end });

store.dispatch(setIntegratedAlertLayerStart(dFormat));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_ALERTS, start, end });

const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_ALERTS);
selectedLayer.visible = true;
store.dispatch(setGladStart(dFormat));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
store.dispatch(setGlad2Start(dFormat));

await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_S2_ALERTS, start, end });
} else if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
store.dispatch(setRaddAlertStart(dFormat));

await mapController.toggleGladLayer({ id: LAYER_IDS.RADD_ALERTS, start, end });
}
};

export const onEndDateChange = async (date) => {
let start;
const end = new Date(dFormat).getJulian();
const integratedAlertLayer = store.getState().appState.leftPanel.integratedAlertLayer;

if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
//@ts-ignore
start = new Date(gfwIntegratedStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GFW_INTEGRATED_ALERTS, start, end });

store.dispatch(setIntegratedAlertLayerEnd(date));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
//@ts-ignore

start = new Date(gladStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_ALERTS, start, end });

const selectedLayer = mapController._map!.findLayerById(LAYER_IDS.GLAD_ALERTS);
selectedLayer.visible = true;
store.dispatch(setGladEnd(date));
} else if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
store.dispatch(setGlad2End(date));

//@ts-ignore
start = new Date(glad2Start).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.GLAD_S2_ALERTS, start, end });
} else if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
store.dispatch(setRaddAlertEnd(date));
//@ts-ignore

start = new Date(raddAlertStart).getJulian();
await mapController.toggleGladLayer({ id: LAYER_IDS.RADD_ALERTS, start, end });
}
};

export const showGeographicCoverage = async () => {
const [VectorTileLayer] = await loadModules(['esri/layers/VectorTileLayer']);
const geographicCoverage = store.getState().appState.leftPanel.geographicCoverage;
const integratedAlertLayer = store.getState().appState.leftPanel.integratedAlertLayer;

let geographicCoverageLayer;
if (integratedAlertLayer === 'GFW_INTEGRATED_ALERTS' || integratedAlertLayer === 'GLAD_ALERTS') {
geographicCoverageLayer = new VectorTileLayer({
url: 'https://tiles.globalforestwatch.org/umd_glad_landsat_alerts_coverage/v2014/default/root.json',
id: 'GEOGRAPHIC_COVERAGE_LAYER',
});
}
if (integratedAlertLayer === 'GLAD_S2_ALERTS') {
const gladS2Layer = await createGladS2Layer();
geographicCoverageLayer = new gladS2Layer({
urlTemplate:
'https://tiles.globalforestwatch.org/umd_glad_sentinel2_alerts_coverage/v20210413/default/{z}/{x}/{y}.png',
opacity: '.5',
view: mapController._mapview,
id: 'GEOGRAPHIC_COVERAGE_LAYER',
});
}
if (integratedAlertLayer === 'RADD_ALERTS') {
const raddLayer = await createRadd();
geographicCoverageLayer = new raddLayer({
urlTemplate: 'https://tiles.globalforestwatch.org/wur_radd_coverage/v20211016/default/{z}/{x}/{y}.png',
opacity: '.5',
view: mapController._mapview,
id: 'GEOGRAPHIC_COVERAGE_LAYER',
});
}

store.dispatch(setGeographicCoverage(!geographicCoverage));
if (geographicCoverage) {
const geographicCoverageLayerOld: any = mapController._map!.findLayerById('GEOGRAPHIC_COVERAGE_LAYER');
mapController._map?.remove(geographicCoverageLayerOld);
} else {
mapController._map?.add(geographicCoverageLayer);
}
};

export const handleDateToggle = (startDate, endDate) => {
const integratedAlertLayer = store.getState().appState.leftPanel.integratedAlertLayer;
const gfwIntegratedStart = store.getState().appState.leftPanel.gfwIntegratedStart;
const gfwIntegratedEnd = store.getState().appState.leftPanel.gfwIntegratedEnd;
const glad2Start = store.getState().appState.leftPanel.glad2Start;
const glad2End = store.getState().appState.leftPanel.glad2End;
const gladStart = store.getState().appState.leftPanel.gladStart;
const gladEnd = store.getState().appState.leftPanel.gladEnd;
const raddAlertStart = store.getState().appState.leftPanel.raddAlertStart;
const raddAlertEnd = store.getState().appState.leftPanel.raddAlertEnd;

if (integratedAlertLayer === LAYER_IDS.GFW_INTEGRATED_ALERTS) {
return { start: gfwIntegratedStart, end: gfwIntegratedEnd };
}
if (integratedAlertLayer === LAYER_IDS.GLAD_S2_ALERTS) {
return { start: glad2Start, end: glad2End };
}
if (integratedAlertLayer === LAYER_IDS.GLAD_ALERTS) {
return { start: gladStart, end: gladEnd };
}
if (integratedAlertLayer === LAYER_IDS.RADD_ALERTS) {
return { start: raddAlertStart, end: raddAlertEnd };
}
return { start: startDate, end: endDate };
};

0 comments on commit 478f02d

Please sign in to comment.