Interactive interface for browsing global, full-resolution satellite imagery
fix selector, undo timeline changes
Jason Kent29d4f6e4f6e5
diff --git a/web/js/components/date-selector/date-selector.js b/web/js/components/date-selector/date-selector.jsindex 23dbcb8cc..10a8a7037 100644--- a/web/js/components/date-selector/date-selector.js+++ b/web/js/components/date-selector/date-selector.js@@ -168,7 +168,7 @@ class DateSelector extends Component {}if (month) {- const realMonth = util.stringInArray(dAY, month);+ const realMonth = util.stringInArray(day, month);const maxDatePrev = new Date(date.getUTCFullYear(),date.getUTCMonth() + 1,diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 8bfc9c35b..2050bd313 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -34,6 +34,7 @@ import {} from '../../components/timeline/date-util';import {dateRange as getDateRange,+ hasSubDaily,subdailyLayersActive,getActiveLayers,} from '../../modules/layers/selectors';@@ -1303,10 +1304,10 @@ function mapStateToProps(state) {const activeLayers = getActiveLayers(state);const projection = proj.id;const activeLayersFiltered = filterProjLayersWithStartDate(activeLayers, projection);- // const hasSubdailyLayers = isCompareModeActive- // ? hasSubDaily(layers.active.layers) || hasSubDaily(layers.activeB.layers)- // : hasSubDaily(activeLayers);- const hasSubdailyLayers = subdailyLayersActive(state);+ const hasSubdailyLayers = isCompareModeActive+ ? hasSubDaily(layers.active.layers) || hasSubDaily(layers.activeB.layers)+ : subdailyLayersActive(state);+// if future layers are included, timeline axis end date will extend past appNowconst hasFutureLayers = checkHasFutureLayers(state);diff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.jsindex 09436d56e..03d47cf03 100644--- a/web/js/modules/layers/selectors.js+++ b/web/js/modules/layers/selectors.js@@ -214,7 +214,7 @@ export function hasSubDaily(layers) {return false;}-export const subdailyLayersActive = () => createSelector(+export const subdailyLayersActive = createSelector([getActiveLayers],(layers) => hasSubDaily(layers),);