Merge pull request #4694 from wri/feat/update-VIIRS-FLAG-920

[FLAG-920] Update all VIIRS tables version
wri · Sep 29, 2023 · 8683500 · 8683500
2 parents 9716d6f + 0300653
commit 8683500
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 30 deletions.
diff --git a/components/widgets/fires/burned-area-cumulative/index.js b/components/widgets/fires/burned-area-cumulative/index.js
@@ -98,7 +98,7 @@ const defaultConfig = {
     fires: 3,
   },
   settings: {
-    dataset: 'modis',
+    dataset: 'modis_burned_area',
     firesThreshold: 0,
   },
   sentences: {
@@ -151,10 +151,12 @@ export default {
   refetchKeys: ['dataset'],
   getWidget: (widgetSettings) => {
     // called when settings changes
-    if (widgetSettings?.dataset !== 'modis_burned_area') {
+    if (!widgetSettings || !widgetSettings.dataset) {
+      return defaultConfig;
+    }
+    if (widgetSettings.dataset !== 'modis_burned_area') {
       return firesAlertsCumulative;
     }
-
     return defaultConfig;
   },
 };
diff --git a/components/widgets/fires/burned-area-ranked/index.js b/components/widgets/fires/burned-area-ranked/index.js
@@ -118,7 +118,7 @@ const defaultConfig = {
     page: 0,
     period: 'week',
     weeks: 4,
-    dataset: 'modis',
+    dataset: 'modis_burned_area',
     layerStartDate: null,
     layerEndDate: null,
     firesThreshold: 0,
@@ -163,10 +163,12 @@ export default {
   refetchKeys: ['dataset'],
   getWidget: (widgetSettings) => {
     // called when settings changes
-    if (widgetSettings?.dataset !== 'modis_burned_area') {
+    if (!widgetSettings || !widgetSettings.dataset) {
+      return defaultConfig;
+    }
+    if (widgetSettings.dataset !== 'modis_burned_area') {
       return firesRanked;
     }
-
     return defaultConfig;
   },
 };
diff --git a/components/widgets/fires/burned-area/index.js b/components/widgets/fires/burned-area/index.js
@@ -86,7 +86,7 @@ export default {
     fires: 1,
   },
   settings: {
-    dataset: 'modis',
+    dataset: 'modis_burned_area',
     firesThreshold: 0,
   },
   sentences: {

diff --git a/components/widgets/fires/fire-alerts-simple/index.js b/components/widgets/fires/fire-alerts-simple/index.js
@@ -108,7 +108,7 @@ export default {
   },
   // initial settings
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
   },
   getData: async (params) => {
     const { VIIRS } = await handleGfwParamsMeta(params);

diff --git a/components/widgets/fires/fires-alerts-cumulative/index.js b/components/widgets/fires/fires-alerts-cumulative/index.js
@@ -61,7 +61,7 @@ export default {
     fires: 2,
   },
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
     confidence: 'h',
   },
   sentences: {

diff --git a/components/widgets/fires/fires-alerts-historical-daily/index.js b/components/widgets/fires/fires-alerts-historical-daily/index.js
@@ -32,7 +32,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
   },
   datasets: [
     {

diff --git a/components/widgets/fires/fires-alerts-historical-weekly/index.js b/components/widgets/fires/fires-alerts-historical-weekly/index.js
@@ -62,7 +62,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
     minDate: '2000-01-01',
     confidence: '',
   },

diff --git a/components/widgets/fires/fires-alerts-historical/index.js b/components/widgets/fires/fires-alerts-historical/index.js
@@ -61,7 +61,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
     minDate: '2000-01-01',
     confidence: '',
   },

diff --git a/components/widgets/fires/fires-alerts/index.js b/components/widgets/fires/fires-alerts/index.js
@@ -94,7 +94,7 @@ const defaultConfig = {
     fires: 1,
   },
   settings: {
-    dataset: 'modis',
+    dataset: 'viirs',
     confidence: 'h',
   },
   sentences: {

diff --git a/components/widgets/fires/fires-ranked/index.js b/components/widgets/fires/fires-ranked/index.js
@@ -101,7 +101,7 @@ export default {
     page: 0,
     period: 'week',
     weeks: 4,
-    dataset: 'modis',
+    dataset: 'viirs',
     layerStartDate: null,
     layerEndDate: null,
   },

diff --git a/components/widgets/fires/fires-within/index.js b/components/widgets/fires/fires-within/index.js
@@ -75,7 +75,7 @@ export default {
   settings: {
     period: 'week',
     weeks: 13,
-    dataset: 'modis',
+    dataset: 'viirs',
     confidence: 'h',
   },
   settingsBtnConfig: {

diff --git a/data/analysis-datasets-versions.json b/data/analysis-datasets-versions.json
@@ -15,21 +15,21 @@
   "ANNUAL_WDPA_SUMMARY": "v20230502",
   "ANNUAL_WDPA_WHITELIST": "v20230502",
 
-  "VIIRS_ADM0_WHITELIST": "v20220726",
-  "VIIRS_ADM1_WHITELIST": "v20220726",
-  "VIIRS_ADM2_WHITELIST": "v20220726",
-  "VIIRS_ADM0_DAILY": "v20220726",
-  "VIIRS_ADM1_DAILY": "v20220726",
-  "VIIRS_ADM2_DAILY": "v20220726",
-  "VIIRS_ADM0_WEEKLY": "v20220726",
-  "VIIRS_ADM1_WEEKLY": "v20220726",
-  "VIIRS_ADM2_WEEKLY": "v20220726",
-  "VIIRS_GEOSTORE_WHITELIST": "v20220713",
-  "VIIRS_GEOSTORE_DAILY": "v20220713",
-  "VIIRS_GEOSTORE_WEEKLY": "v20220713",
-  "VIIRS_WDPA_DAILY": "v20220713",
-  "VIIRS_WDPA_WEEKLY": "v20220713",
-  "VIIRS_WDPA_WHITELIST": "v20220713",
+  "VIIRS_ADM0_WHITELIST": "v20230901",
+  "VIIRS_ADM1_WHITELIST": "v20230901",
+  "VIIRS_ADM2_WHITELIST": "v20230901",
+  "VIIRS_ADM0_DAILY": "v20230901",
+  "VIIRS_ADM1_DAILY": "v20230901",
+  "VIIRS_ADM2_DAILY": "v20230901",
+  "VIIRS_ADM0_WEEKLY": "v20230901",
+  "VIIRS_ADM1_WEEKLY": "v20230901",
+  "VIIRS_ADM2_WEEKLY": "v20230901",
+  "VIIRS_GEOSTORE_WHITELIST": "v20230901",
+  "VIIRS_GEOSTORE_DAILY": "v20230901",
+  "VIIRS_GEOSTORE_WEEKLY": "v20230901",
+  "VIIRS_WDPA_DAILY": "v20230901",
+  "VIIRS_WDPA_WEEKLY": "v20230901",
+  "VIIRS_WDPA_WHITELIST": "v20230901",
 
   "MODIS_ADM0_WHITELIST": "v20221110",
   "MODIS_ADM1_WHITELIST": "v20221110",

diff --git a/data/fires-datasets.json b/data/fires-datasets.json
@@ -1,4 +1,11 @@
 [
+  {
+    "label": "VIIRS Alerts",
+    "value": "viirs",
+    "unit": "alerts",
+    "metaKey": null,
+    "infoText": "VIIRS alerts have a higher resolution, but are less performant in cloudy areas than MODIS alerts"
+  },
   {
     "label": "MODIS Alerts",
     "value": "modis",