feat(treeCover): fix other three cover value calculation

wri · Dec 11, 2024 · 93c9607 · 93c9607
1 parent 108b4fd
commit 93c9607
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/components/widgets/forest-change/tree-loss-plantations/index.js b/components/widgets/forest-change/tree-loss-plantations/index.js
@@ -14,8 +14,6 @@ import {
   NATURAL_FOREST_2020,
 } from 'data/layers';
 
-import { EuropeFAOCountries } from 'utils/fao-countries';
-
 import getWidgetProps from './selectors';
 
 const MIN_YEAR = 2021;
@@ -72,9 +70,6 @@ export default {
   },
   sentence:
     'From {startYear} to {endYear}, {percentage} of tree cover loss in {location} occurred within {lossPhrase}. The total loss within natural forest was {totalLoss} equivalent to {value} of CO\u2082e emissions.',
-  blacklists: {
-    adm0: EuropeFAOCountries,
-  },
   settings: {
     threshold: 30,
     startYear: MIN_YEAR,

diff --git a/components/widgets/forest-change/tree-loss-plantations/selectors.js b/components/widgets/forest-change/tree-loss-plantations/selectors.js
@@ -37,11 +37,11 @@ export const parseData = createSelector(
     const mappedData = zeroFilledData.map((list) => {
       return {
         iso: list[0].iso,
-        outsideAreaLoss: list[1].area,
-        outsideCo2Loss: list[1].emissions,
+        outsideAreaLoss: list[1].area || 0,
+        outsideCo2Loss: list[1].emissions || 0,
         areaLoss: list[0].area,
         co2Loss: list[0].emissions,
-        totalLoss: list[0].area + list[1].area + list[2].area,
+        totalLoss: list[0].area || 0 + list[1].area || 0 + list[2].area || 0,
         year: list[0].year,
       };
     });

diff --git a/components/widgets/land-cover/tree-cover/selectors.js b/components/widgets/land-cover/tree-cover/selectors.js
@@ -30,7 +30,9 @@ export const parseData = createSelector(
         value: hasPlantations ? plantationsCover : cover - plantationsCover,
         color: colors.naturalForest,
         percentage:
-          ((hasPlantations ? plantationsCover : cover) / totalArea) * 100,
+          ((hasPlantations ? plantationsCover : cover - plantationsCover) /
+            totalArea) *
+          100,
       },
       {
         label: 'Other Land Cover',
@@ -43,9 +45,9 @@ export const parseData = createSelector(
     if (hasPlantations) {
       parsedData.splice(1, 0, {
         label: 'Other tree cover',
-        value: otherCover,
+        value: totalCover - plantationsCover,
         color: colors.otherCover,
-        percentage: (otherCover / totalArea) * 100,
+        percentage: ((totalCover - plantationsCover) / totalArea) * 100,
       });
     }