Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2313

Jason Kentd87c7cddff16
diff --git a/web/js/map/natural-events/natural-events.js b/web/js/map/natural-events/natural-events.js
index 188c8f802..a4107da1f 100644
--- a/web/js/map/natural-events/natural-events.js
+++ b/web/js/map/natural-events/natural-events.js
@@ -6,6 +6,7 @@ import * as olProj from 'ol/proj';
import {
getDefaultEventDate,
validateGeometryCoords,
+ toEventDateString,
} from '../../modules/natural-events/util';
import util from '../../util/util';
import { selectDate as selectDateAction } from '../../modules/date/actions';
@@ -25,6 +26,20 @@ const zoomLevelReference = {
Volcanoes: 6,
};
+/* For Wildfires that didn't happen today, move the timeline forward a day
+* to improve the chance that the fire is visible.
+* NOTE: If the fire happened yesterday and the imagery isn't yet available
+* for today, this may not help.
+*/
+const getUseDate = (event, date) => {
+ const today = toEventDateString(util.now());
+ const yesterday = toEventDateString(util.yesterday());
+ const recentDate = date === today || date === yesterday;
+ const isWildfireEvent = event.categories[0].title === 'Wildfires';
+ const parsedDate = util.parseDateUTC(date);
+ return isWildfireEvent && !recentDate ? util.dateAdd(parsedDate, 'day', 1) : parsedDate;
+};
+
class NaturalEvents extends React.Component {
constructor(props) {
super(props);
@@ -76,12 +91,12 @@ class NaturalEvents extends React.Component {
getZoomPromise = function(
event,
date,
- isIdChange,
+ isSameEventID,
isInitialLoad,
) {
return isInitialLoad
? new Promise((resolve, reject) => { resolve(); })
- : this.zoomToEvent(event, date, isIdChange);
+ : this.zoomToEvent(event, date, isSameEventID);
};
selectEvent(id, date, isInitialLoad) {
@@ -96,32 +111,21 @@ class NaturalEvents extends React.Component {
const prevCategory = prevEvent ? prevEvent.categories[0].title : false;
const event = eventsData.find((e) => e.id === id);
const category = event && event.categories[0].title;
- const isSameCategory = category === prevCategory;
+ const categoryChange = category !== prevCategory;
if (!event) {
return;
}
const eventDate = date || getDefaultEventDate(event);
- const dateFormat = (d) => d.toISOString().split('T')[0];
+ const useDate = getUseDate(event, date);
this.setState({ prevSelectedEvent: { id, date } });
this.getZoomPromise(event, eventDate, !isIdChange, isInitialLoad).then(() => {
- /* For Wildfires that didn't happen today, move the timeline forward a day
- * to improve the chance that the fire is visible.
- * NOTE: If the fire happened yesterday and the imagery isn't yet available
- * for today, this may not help.
- */
- if (event.categories[0].title === 'Wildfires' && !isInitialLoad) {
- const today = dateFormat(util.now());
- const yesterday = dateFormat(util.yesterday());
- if (date !== today || date !== yesterday) {
- selectDate(util.dateAdd(util.parseDateUTC(date), 'day', 1));
+ if (!isInitialLoad) {
+ selectDate(useDate);
+ if (categoryChange) {
+ activateLayersForEventCategory(event.categories[0].title);
}
- } else if (!isInitialLoad) {
- selectDate(util.parseDateUTC(date));
- }
- if (isIdChange && !isSameCategory && !isInitialLoad) {
- activateLayersForEventCategory(event.categories[0].title);
}
selectEventFinished();
});
diff --git a/web/js/map/ui.js b/web/js/map/ui.js
index 8e9d8363d..50bbf8fc7 100644
--- a/web/js/map/ui.js
+++ b/web/js/map/ui.js
@@ -196,8 +196,9 @@ export default function mapui(models, config, store) {
case paletteConstants.SET_CUSTOM:
case paletteConstants.SET_DISABLED_CLASSIFICATION:
case paletteConstants.CLEAR_CUSTOM:
- case layerConstants.ADD_LAYERS_FOR_EVENT:
return setTimeout(reloadLayers, 100);
+ case layerConstants.ADD_LAYERS_FOR_EVENT:
+ return setTimeout(reloadLayers, 1500);
case vectorStyleConstants.SET_FILTER_RANGE:
case vectorStyleConstants.SET_VECTORSTYLE:
case vectorStyleConstants.CLEAR_VECTORSTYLE:
diff --git a/web/js/modules/natural-events/util.js b/web/js/modules/natural-events/util.js
index 4d3da7dcd..7e82b0b50 100644
--- a/web/js/modules/natural-events/util.js
+++ b/web/js/modules/natural-events/util.js
@@ -152,19 +152,23 @@ export function getEventsRequestURL (state) {
return `${baseUrl}/events${util.toQueryString(params)}`;
}
+export const toEventDateString = (d) => d.toISOString().split('T')[0];
+
/**
*
* @param {*} event
*/
-export function getDefaultEventDate(event) {
- const preDate = event.geometry[0] && event.geometry[0].date;
- let date = new Date(preDate).toISOString().split('T')[0];
- if (event.geometry.length < 2) return date;
- const category = event.categories.title || event.categories[0].title;
- const today = util.now().toISOString().split('T')[0];
+export function getDefaultEventDate({ geometry, categories }) {
+ const preDate = geometry[0] && geometry[0].date;
+ let date = toEventDateString(new Date(preDate));
+ if (geometry.length < 2) {
+ return date;
+ }
+ const category = categories.title || categories[0].title;
+ const today = toEventDateString(util.now());
// For storms that happened today, get previous date
if (date === today && category === 'Severe Storms') {
- [date] = new Date(event.geometry[1].date).toISOString().split('T');
+ [date] = toEventDateString(new Date(geometry[1].date));
}
return date;
}