feat(forest-types): add natural forest option

wri7tno · wri7tno · commit 113fd59be2cb · 2025-03-17T14:24:40.000-06:00
diff --git a/components/ui/dynamic-sentence/component.jsx b/components/ui/dynamic-sentence/component.jsx
@@ -62,6 +62,10 @@ class DynamicSentence extends PureComponent {
       });
     }
 
+    if (formattedSentence?.includes('sbtn')) {
+      formattedSentence = formattedSentence?.replace('sbtn', 'SBTN');
+    }
+
     formattedSentence = [formattedSentence?.replace('{area}', 'selected area')];
     if (component) {
       const mappedComponent = {
@@ -91,6 +95,17 @@ class DynamicSentence extends PureComponent {
       );
     }
 
+    if (
+      Array.isArray(formattedSentence) &&
+      formattedSentence.length !== 0 &&
+      formattedSentence[0]?.includes('covering a total of')
+    ) {
+      formattedSentence[0] = formattedSentence[0].replace(
+        '<b>covering a total of ',
+        'covering a total of <b>'
+      );
+    }
+
     return (
       <div
         data-test={!!testId && testId}
diff --git a/components/widgets/climate/carbon-flux/index.js b/components/widgets/climate/carbon-flux/index.js
@@ -43,6 +43,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/climate/emissions-deforestation/index.js b/components/widgets/climate/emissions-deforestation/index.js
@@ -45,6 +45,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/burned-area-cumulative/index.js b/components/widgets/fires/burned-area-cumulative/index.js
@@ -36,6 +36,7 @@ const defaultConfig = {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/burned-area-ranked/index.js b/components/widgets/fires/burned-area-ranked/index.js
@@ -33,6 +33,7 @@ const defaultConfig = {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/burned-area/index.js b/components/widgets/fires/burned-area/index.js
@@ -30,6 +30,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fire-alerts-simple/index.js b/components/widgets/fires/fire-alerts-simple/index.js
@@ -80,6 +80,7 @@ export default {
       placeholder: 'All categories',
       clearable: true,
       border: true,
+      whitelist: ['aze', 'landmark', 'kba', 'mining', 'wdpa'],
     },
     {
       key: 'dataset',
diff --git a/components/widgets/fires/fire-alerts-simple/selectors.js b/components/widgets/fires/fire-alerts-simple/selectors.js
@@ -55,12 +55,12 @@ export const parseConfig = createSelector(
     } = data;
     const alertsLabel = indicator
       ? translateText('Other alerts in {indicatorLabel}', {
-          indicatorLabel: indicator.label,
+          indicatorLabel: indicator.label.replace('sbtn', 'SBTN'),
         })
       : translateText('Other alerts');
     const highConfidenceAlertsLabel = indicator
       ? translateText('High confidence alerts in {indicatorLabel}', {
-          indicatorLabel: indicator.label,
+          indicatorLabel: indicator.label.replace('sbtn', 'SBTN'),
         })
       : translateText('High confidence alerts');
 
diff --git a/components/widgets/fires/fires-alerts-cumulative/index.js b/components/widgets/fires/fires-alerts-cumulative/index.js
@@ -25,6 +25,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fires-alerts-historical-weekly/index.js b/components/widgets/fires/fires-alerts-historical-weekly/index.js
@@ -28,6 +28,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fires-alerts-historical/index.js b/components/widgets/fires/fires-alerts-historical/index.js
@@ -28,6 +28,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fires-alerts/index.js b/components/widgets/fires/fires-alerts/index.js
@@ -38,6 +38,7 @@ const defaultConfig = {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fires-ranked/index.js b/components/widgets/fires/fires-ranked/index.js
@@ -24,6 +24,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/fires-within/index.js b/components/widgets/fires/fires-within/index.js
@@ -30,6 +30,7 @@ export default {
       placeholder: 'All land cover',
       clearable: true,
       border: false,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/tree-loss-fires-annual/index.js b/components/widgets/fires/tree-loss-fires-annual/index.js
@@ -45,7 +45,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
-      blacklist: ['mangroves_2016'],
+      blacklist: ['mangroves_2016', 'natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/fires/tree-loss-fires-proportion/index.js b/components/widgets/fires/tree-loss-fires-proportion/index.js
@@ -44,7 +44,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
-      blacklist: ['mangroves_2016'],
+      blacklist: ['mangroves_2016', 'natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/forest-change/glad-alerts-simple/index.js b/components/widgets/forest-change/glad-alerts-simple/index.js
@@ -67,6 +67,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/forest-change/glad-alerts/index.js b/components/widgets/forest-change/glad-alerts/index.js
@@ -95,6 +95,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/forest-change/glad-ranked/index.js b/components/widgets/forest-change/glad-ranked/index.js
@@ -33,6 +33,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'landCategory',
diff --git a/components/widgets/forest-change/integrated-alerts-ranked/index.js b/components/widgets/forest-change/integrated-alerts-ranked/index.js
@@ -38,15 +38,7 @@ export default {
       type: 'select',
       placeholder: 'All tree cover',
       clearable: true,
-    },
-    {
-      key: 'landCategory',
-      label: 'Land Category',
-      type: 'select',
-      whitelist: ['mining', 'wdpa', 'landmark'],
-      placeholder: 'All categories',
-      clearable: true,
-      border: true,
+      whitelist: ['natural_forests_2020'],
     },
     {
       key: 'deforestationAlertsDataset',
@@ -67,12 +59,6 @@ export default {
       whitelist: ['%', 'ha'],
       border: true,
     },
-    {
-      key: 'threshold',
-      label: 'canopy density',
-      type: 'mini-select',
-      metaKey: 'widget_canopy_density',
-    },
   ],
   pendingKeys: ['extentYear', 'threshold'],
   refetchKeys: [
@@ -98,6 +84,7 @@ export default {
       layers: [GLAD_ALERTS],
     },
   ],
+  noStatements: true,
   sortOrder: {
     summary: 6,
     forestChange: 10,
diff --git a/components/widgets/forest-change/integrated-deforestation-alerts/index.js b/components/widgets/forest-change/integrated-deforestation-alerts/index.js
@@ -136,6 +136,7 @@ export default {
       placeholder: 'All categories',
       clearable: true,
       border: true,
+      whitelist: ['aze', 'landmark', 'kba', 'mining', 'wdpa'],
     },
     {
       key: 'dateRange',
diff --git a/components/widgets/forest-change/integrated-deforestation-alerts/selectors.js b/components/widgets/forest-change/integrated-deforestation-alerts/selectors.js
@@ -104,15 +104,24 @@ export const parseConfig = createSelector(
     } = data;
 
     const lowAlertsLabel = indicator
-      ? `Detection by a single alert system in ${indicator.label}`
+      ? `Detection by a single alert system in ${indicator.label.replace(
+          'sbtn',
+          'SBTN'
+        )}`
       : 'Detection by a single alert system';
 
     const highAlertsLabel = indicator
-      ? `High confidence detection by a single alert system in ${indicator.label}`
+      ? `High confidence detection by a single alert system in ${indicator.label.replace(
+          'sbtn',
+          'SBTN'
+        )}`
       : 'High confidence detection by a single alert system';
 
     const highestAlertsLabel = indicator
-      ? `Highest confidence detection by multiple alert systems in ${indicator.label}`
+      ? `Highest confidence detection by multiple alert systems in ${indicator.label.replace(
+          'sbtn',
+          'SBTN'
+        )}`
       : 'Highest confidence detection by multiple alert systems';
 
     const highColour = colors.integratedHigh;
@@ -201,11 +210,12 @@ export const parseSentence = createSelector(
       totalArea: !totalArea
         ? ' '
         : translateText('covering a total of {area}', {
-          area: formatNumber({
-            num: totalArea,
-            unit: 'ha',
-            spaceUnit: true,
-          })}),
+            area: formatNumber({
+              num: totalArea,
+              unit: 'ha',
+              spaceUnit: true,
+            }),
+          }),
       total: formatNumber({ num: totalAlertCount, unit: ',' }),
       highConfPerc:
         highAlertPercentage === 0
diff --git a/components/widgets/forest-change/tree-loss-plantations/index.js b/components/widgets/forest-change/tree-loss-plantations/index.js
@@ -68,7 +68,7 @@ export default {
       layers: [FOREST_LOSS],
     },
   ],
-  dataType: 'naturalForest',
+  noStatements: true,
   sortOrder: {
     forestChange: 2,
   },
diff --git a/components/widgets/land-cover/natural-forest/index.js b/components/widgets/land-cover/natural-forest/index.js
@@ -50,7 +50,7 @@ export default {
       layers: [NATURAL_FOREST_2020],
     },
   ],
-  dataType: 'naturalForest',
+  noStatements: true,
   sortOrder: {
     summary: 6,
     landCover: 1,
diff --git a/components/widgets/land-cover/ranked-forest-types/index.js b/components/widgets/land-cover/ranked-forest-types/index.js
@@ -35,6 +35,7 @@ export default {
       type: 'select',
       placeholder: 'All land cover',
       clearable: true,
+      blacklist: ['natural_forests_2020'],
     },
     {
       key: 'decile',
diff --git a/components/widgets/land-cover/tree-cover-located/index.js b/components/widgets/land-cover/tree-cover-located/index.js
@@ -27,8 +27,7 @@ export default {
   alerts: [
     {
       id: 'tree-cover-located-alert-1',
-      text:
-        'Datasets available here (Tree Cover 2000/ 2010 and Tropical Tree Cover 2020) use different methodologies to measure tree cover. Read [our blog](https://www.globalforestwatch.org/blog/data-and-research/tree-cover-data-comparison/) for more information.',
+      text: 'Datasets available here (Tree Cover 2000/ 2010 and Tropical Tree Cover 2020) use different methodologies to measure tree cover. Read [our blog](https://www.globalforestwatch.org/blog/data-and-research/tree-cover-data-comparison/) for more information.',
       visible: [
         'global',
         'country',
@@ -152,6 +151,7 @@ export default {
         type: 'select',
         placeholder: 'All tree cover',
         clearable: true,
+        blacklist: ['natural_forests_2020'],
       },
       {
         key: 'landCategory',
diff --git a/components/widgets/selectors.js b/components/widgets/selectors.js
@@ -444,6 +444,7 @@ export const getWidgets = createSelector(
         getDataType: dataTypeFn,
         settingsConfig: settingsConfigArr,
         getSettingsConfig: settingsConfigFn,
+        noStatements,
       } = w || {};
       const active =
         (!activeWidgetKey && index === 0) || activeWidgetKey === widget;
@@ -565,6 +566,7 @@ export const getWidgets = createSelector(
         type,
         dataType,
         active,
+        noStatements,
         settings: {
           ...defaultSettings,
           ...allowedFooterSettings,
diff --git a/components/widgets/utils/config.js b/components/widgets/utils/config.js
@@ -358,6 +358,7 @@ export const getStatements = ({
   landCategory,
   forestType,
   datasets,
+  noStatements,
 }) => {
   if (!settings) return null;
   const { extentYear, threshold, decile } = settings;
@@ -440,7 +441,7 @@ export const getStatements = ({
     ...(indicatorStatements || []),
   ]);
 
-  if (dataType === 'naturalForest') {
+  if (noStatements) {
     return [];
   }
 
diff --git a/data/forest-types.js b/data/forest-types.js
@@ -3,12 +3,14 @@ import {
   INTACT_FOREST_LANDSCAPES_DATASET,
   PRIMARY_FOREST_DATASET,
   MANGROVE_FORESTS_DATASET,
+  NATURAL_FOREST,
 } from 'data/datasets';
 import {
   TREE_PLANTATIONS,
   INTACT_FOREST_LANDSCAPES,
   PRIMARY_FOREST,
   MANGROVE_FORESTS,
+  NATURAL_FOREST_2020,
 } from 'data/layers';
 
 export default [
@@ -98,6 +100,20 @@ export default [
     ],
     hidden: false,
   },
+  {
+    label: 'SBTN natural forest 2020',
+    value: 'natural_forests_2020',
+    dataType: 'number',
+    tableKey: 'sbtn_natural_forests__class',
+    metaKey: 'sbtn_natural_forests_map',
+    global: true,
+    datasets: [
+      {
+        dataset: NATURAL_FOREST,
+        layers: [NATURAL_FOREST_2020],
+      },
+    ],
+  },
   {
     label: 'Tree cover loss driver category',
     value: 'tsc',
diff --git a/services/get-where-query.js b/services/get-where-query.js

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ export default {`
`43`	`43`	`type: 'select',`
`44`	`44`	`placeholder: 'All tree cover',`
`45`	`45`	`clearable: true,`
	`46`	`+ blacklist: ['natural_forests_2020'],`
`46`	`47`	`},`
`47`	`48`	`{`
`48`	`49`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ export default {`
`45`	`45`	`type: 'select',`
`46`	`46`	`placeholder: 'All tree cover',`
`47`	`47`	`clearable: true,`
	`48`	`+ blacklist: ['natural_forests_2020'],`
`48`	`49`	`},`
`49`	`50`	`{`
`50`	`51`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ const defaultConfig = {`
`36`	`36`	`type: 'select',`
`37`	`37`	`placeholder: 'All land cover',`
`38`	`38`	`clearable: true,`
	`39`	`+ blacklist: ['natural_forests_2020'],`
`39`	`40`	`},`
`40`	`41`	`{`
`41`	`42`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ const defaultConfig = {`
`33`	`33`	`type: 'select',`
`34`	`34`	`placeholder: 'All land cover',`
`35`	`35`	`clearable: true,`
	`36`	`+ blacklist: ['natural_forests_2020'],`
`36`	`37`	`},`
`37`	`38`	`{`
`38`	`39`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export default {`
`30`	`30`	`type: 'select',`
`31`	`31`	`placeholder: 'All land cover',`
`32`	`32`	`clearable: true,`
	`33`	`+ blacklist: ['natural_forests_2020'],`
`33`	`34`	`},`
`34`	`35`	`{`
`35`	`36`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ export default {`
`80`	`80`	`placeholder: 'All categories',`
`81`	`81`	`clearable: true,`
`82`	`82`	`border: true,`
	`83`	`+ whitelist: ['aze', 'landmark', 'kba', 'mining', 'wdpa'],`
`83`	`84`	`},`
`84`	`85`	`{`
`85`	`86`	`key: 'dataset',`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ export default {`
`25`	`25`	`type: 'select',`
`26`	`26`	`placeholder: 'All land cover',`
`27`	`27`	`clearable: true,`
	`28`	`+ blacklist: ['natural_forests_2020'],`
`28`	`29`	`},`
`29`	`30`	`{`
`30`	`31`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export default {`
`28`	`28`	`type: 'select',`
`29`	`29`	`placeholder: 'All land cover',`
`30`	`30`	`clearable: true,`
	`31`	`+ blacklist: ['natural_forests_2020'],`
`31`	`32`	`},`
`32`	`33`	`{`
`33`	`34`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ const defaultConfig = {`
`38`	`38`	`type: 'select',`
`39`	`39`	`placeholder: 'All land cover',`
`40`	`40`	`clearable: true,`
	`41`	`+ blacklist: ['natural_forests_2020'],`
`41`	`42`	`},`
`42`	`43`	`{`
`43`	`44`	`key: 'landCategory',`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ export default {`
`24`	`24`	`type: 'select',`
`25`	`25`	`placeholder: 'All land cover',`
`26`	`26`	`clearable: true,`
	`27`	`+ blacklist: ['natural_forests_2020'],`
`27`	`28`	`},`
`28`	`29`	`{`
`29`	`30`	`key: 'landCategory',`