GTC-2971 Add country-code level to protected_area/landmark by category

Change protected_areas_by_category_area and landmark_by_category_area to ForestChangeDiagnosticDataDoubleTwoCategory, so they are broken down first by country, then category.
wri · Oct 3, 2024 · f3e69c0 · f3e69c0
1 parent c9ce5ae
commit f3e69c0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.../globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticData.scala b/.../globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticData.scala
@@ -72,9 +72,9 @@ case class ForestChangeDiagnosticData(
   /** OTBN category area */
   arg_otbn_area: ForestChangeDiagnosticDataDoubleCategory,
   /** Detailed WDPA category area */
-  protected_areas_by_category_area: ForestChangeDiagnosticDataDoubleCategory,
+  protected_areas_by_category_area: ForestChangeDiagnosticDataDoubleTwoCategory,
   /** Indigenous area (from Landmark dataset) */
-  landmark_by_category_area: ForestChangeDiagnosticDataDoubleCategory,
+  landmark_by_category_area: ForestChangeDiagnosticDataDoubleTwoCategory,
   brazil_biomes: ForestChangeDiagnosticDataDoubleCategory,
   /** IDN Forest Area */
   idn_legal_area: ForestChangeDiagnosticDataDoubleCategory,
@@ -367,8 +367,8 @@ object ForestChangeDiagnosticData {
       ForestChangeDiagnosticDataDouble.empty,
       ForestChangeDiagnosticDataDouble.empty,
       ForestChangeDiagnosticDataDoubleCategory.empty,
-      ForestChangeDiagnosticDataDoubleCategory.empty,
-      ForestChangeDiagnosticDataDoubleCategory.empty,
+      ForestChangeDiagnosticDataDoubleTwoCategory.empty,
+      ForestChangeDiagnosticDataDoubleTwoCategory.empty,
       ForestChangeDiagnosticDataDoubleCategory.empty,
       ForestChangeDiagnosticDataDoubleCategory.empty,
       ForestChangeDiagnosticDataDoubleCategory.empty,

diff --git a/...orestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticRawDataGroup.scala b/...orestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticRawDataGroup.scala
@@ -240,9 +240,9 @@ case class ForestChangeDiagnosticRawDataGroup(umdTreeCoverLossYear: Int,
       .fill(totalArea, isPeatlands),
     arg_otbn_area = ForestChangeDiagnosticDataDoubleCategory
       .fill(argOTBN, totalArea),
-    protected_areas_by_category_area = ForestChangeDiagnosticDataDoubleCategory
-      .fill(protectedAreaByCategory, totalArea),
-    landmark_by_category_area = ForestChangeDiagnosticDataDoubleCategory.fill(landmarkByCategory, totalArea),
+    protected_areas_by_category_area = ForestChangeDiagnosticDataDoubleTwoCategory
+      .fill(countryCode, protectedAreaByCategory, totalArea),
+    landmark_by_category_area = ForestChangeDiagnosticDataDoubleTwoCategory.fill(countryCode, landmarkByCategory, totalArea),
     brazil_biomes = ForestChangeDiagnosticDataDoubleCategory
       .fill(braBiomes, totalArea),
     idn_legal_area = ForestChangeDiagnosticDataDoubleCategory