Merge pull request #4679 from wri/develop

PROD Deploy 2023-08-31 01:08pm EST

components/widgets/fires/burned-area-cumulative/index.js

@@ -25,8 +25,7 @@ const defaultConfig = {
   alerts: [
     {
       id: 'cumulative-burned-areas-1',
-      text:
-        'We are preparing to remove MODIS Burned Areas from the Global Forest Watch site and will not be updating the data going forward. Please e-mail [email protected] with any requests to keep this dataset or with suggestions for new fire-related data sets.',
+      text: 'We are preparing to remove MODIS Burned Areas from the Global Forest Watch site and will not be updating the data going forward. Please e-mail [email protected] with any requests to keep this dataset or with suggestions for new fire-related data sets.',
       visible: ['country', 'dashboard'],
     },
   ],
@@ -99,7 +98,7 @@ const defaultConfig = {
     fires: 3,
   },
   settings: {
-    dataset: 'modis_burned_area',
+    dataset: 'modis',
     firesThreshold: 0,
   },
   sentences: {
@@ -152,12 +151,10 @@ export default {
   refetchKeys: ['dataset'],
   getWidget: (widgetSettings) => {
     // called when settings changes
-    if (!widgetSettings || !widgetSettings.dataset) {
-      return defaultConfig;
-    }
-    if (widgetSettings.dataset !== 'modis_burned_area') {
+    if (widgetSettings?.dataset !== 'modis_burned_area') {
       return firesAlertsCumulative;
     }
+
     return defaultConfig;
   },
 };

components/widgets/fires/burned-area-ranked/index.js

@@ -22,8 +22,7 @@ const defaultConfig = {
   alerts: [
     {
       id: 'regions-most-burned-areas-1',
-      text:
-        'We are preparing to remove MODIS Burned Areas from the Global Forest Watch site and will not be updating the data going forward. Please e-mail [email protected] with any requests to keep this dataset or with suggestions for new fire-related data sets.',
+      text: 'We are preparing to remove MODIS Burned Areas from the Global Forest Watch site and will not be updating the data going forward. Please e-mail [email protected] with any requests to keep this dataset or with suggestions for new fire-related data sets.',
       visible: ['global', 'country', 'adm0', 'adm1', 'dashboard'],
     },
   ],
@@ -119,7 +118,7 @@ const defaultConfig = {
     page: 0,
     period: 'week',
     weeks: 4,
-    dataset: 'modis_burned_area',
+    dataset: 'modis',
     layerStartDate: null,
     layerEndDate: null,
     firesThreshold: 0,
@@ -164,12 +163,10 @@ export default {
   refetchKeys: ['dataset'],
   getWidget: (widgetSettings) => {
     // called when settings changes
-    if (!widgetSettings || !widgetSettings.dataset) {
-      return defaultConfig;
-    }
-    if (widgetSettings.dataset !== 'modis_burned_area') {
+    if (widgetSettings?.dataset !== 'modis_burned_area') {
       return firesRanked;
     }
+
     return defaultConfig;
   },
 };

components/widgets/fires/burned-area/index.js

@@ -86,7 +86,7 @@ export default {
     fires: 1,
   },
   settings: {
-    dataset: 'modis_burned_area',
+    dataset: 'modis',
     firesThreshold: 0,
   },
   sentences: {

components/widgets/fires/fire-alerts-simple/index.js

@@ -108,7 +108,7 @@ export default {
   },
   // initial settings
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
   },
   getData: async (params) => {
     const { VIIRS } = await handleGfwParamsMeta(params);

components/widgets/fires/fires-alerts-cumulative/index.js

@@ -61,7 +61,7 @@ export default {
     fires: 2,
   },
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
     confidence: 'h',
   },
   sentences: {

components/widgets/fires/fires-alerts-historical-daily/index.js

@@ -32,7 +32,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
   },
   datasets: [
     {

components/widgets/fires/fires-alerts-historical-weekly/index.js

@@ -62,7 +62,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
     minDate: '2000-01-01',
     confidence: '',
   },

components/widgets/fires/fires-alerts-historical/index.js

@@ -61,7 +61,7 @@ export default {
   colors: 'fires',
   metaKey: 'widget_fire_alert_location',
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
     minDate: '2000-01-01',
     confidence: '',
   },

components/widgets/fires/fires-alerts/index.js

@@ -94,7 +94,7 @@ const defaultConfig = {
     fires: 1,
   },
   settings: {
-    dataset: 'viirs',
+    dataset: 'modis',
     confidence: 'h',
   },
   sentences: {
@@ -359,13 +359,13 @@ export default {
   proxy: true,
   refetchKeys: ['dataset'],
   getWidget: (widgetSettings) => {
-    // called when settings changes
     if (!widgetSettings || !widgetSettings.dataset) {
       return defaultConfig;
     }
     if (widgetSettings.dataset === 'modis_burned_area') {
       return burnedAreaStats;
     }
+
     return defaultConfig;
   },
 };

components/widgets/fires/fires-ranked/index.js

@@ -101,7 +101,7 @@ export default {
     page: 0,
     period: 'week',
     weeks: 4,
-    dataset: 'viirs',
+    dataset: 'modis',
     layerStartDate: null,
     layerEndDate: null,
   },

components/widgets/fires/fires-within/index.js

@@ -75,7 +75,7 @@ export default {
   settings: {
     period: 'week',
     weeks: 13,
-    dataset: 'viirs',
+    dataset: 'modis',
     confidence: 'h',
   },
   settingsBtnConfig: {

data/fires-datasets.json

@@ -1,11 +1,4 @@
 [
-  {
-    "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",