Interactive interface for browsing global, full-resolution satellite imagery
Removed stopgap code (#6417)
christof-wittreichb4e543b2301a
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.jsonindex 07eb7eb7d..62c478b85 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.json@@ -10,8 +10,7 @@"layergroup": "Cloud Fraction","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.jsonindex 1b1c20fe0..7091c8723 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.json@@ -10,8 +10,7 @@"layergroup": "Cloud Pressure","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.jsonindex 8fb76516c..cda0b45b9 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.json@@ -10,8 +10,7 @@"layergroup": "Formaldehyde","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.jsonindex d7fe5685d..14d3ac950 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.json@@ -10,8 +10,7 @@"layergroup": "Nitrogen Dioxide","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.jsonindex cf7f1a1b4..3028098c7 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.json@@ -10,8 +10,7 @@"layergroup": "Nitrogen Dioxide","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.jsonindex e8e0a8af1..937ae153e 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.json@@ -10,8 +10,7 @@"layergroup": "Ozone","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.jsonindex faa0e985c..b60e75e4a 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.json@@ -10,8 +10,7 @@"layergroup": "Ozone","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.jsonindex d6f6df006..3ed34c4b9 100644--- a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.json+++ b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.json@@ -10,8 +10,7 @@"layergroup": "Aerosol Index","dataAvailability": "dd","startDate": "2023-08-02T15:00:00Z",- "shiftadjacentdays": false,- "hasVariablePeriod": "30M"+ "shiftadjacentdays": false}}}\ No newline at end of filediff --git a/web/js/modules/layers/selectors.js b/web/js/modules/layers/selectors.jsindex e90ac2a5c..8bd5efa58 100644--- a/web/js/modules/layers/selectors.js+++ b/web/js/modules/layers/selectors.js@@ -644,36 +644,11 @@ export const subdailyLayers = createSelector(* @param {Object} state*/export function getSmallestIntervalValue(state) {- const oneMinute = 1;- const oneHour = 60;- const oneDay = 1440;- const timeUnitLookup = {- S: oneMinute / 60,- M: oneMinute,- H: oneHour,- D: oneDay,- };const layers = getActiveLayers(state);- let smallestDelta = timeUnitLookup.D; // 1 day in minutes+ let smallestDelta = 1440; // 1 day in minutesif (layers && layers.length) {for (let i = 0; i < layers.length; i += 1) {- let interval = lodashGet(layers[i], 'dateRanges[0].dateInterval');- const variablePeriod = layers[i]?.hasVariablePeriod;- if (variablePeriod) {- const numberMatch = variablePeriod.match(/[0-9]+/g);- const unitMatch = variablePeriod.match(/[a-zA-Z]+/g);- const time = numberMatch.reduce((acc, val, idx) => {- const number = Number(val);- const unit = unitMatch[idx];- const minutes = number * timeUnitLookup[unit?.toUpperCase?.()];- const invalid = Number.isNaN(minutes);- const valueToAdd = invalid ? (console.warn(`Invalid period: ${variablePeriod}`), 0) : minutes; // eslint-disable-line no-console-- return acc + valueToAdd;- }, 0);-- interval = time;- }+ const interval = lodashGet(layers[i], 'dateRanges[0].dateInterval');if (layers[i].period === 'subdaily' && interval < smallestDelta) {smallestDelta = Number(interval);}