Merge pull request #203 from wri/feature/palm_risk_2023

GTC-2620 Palm risk 2023 update

src/main/resources/raster-catalog-pro.json

@@ -10,7 +10,7 @@
     },
     {
       "name":"wdpa_protected_areas",
-      "source_uri":"s3://gfw-data-lake/wdpa_protected_areas/v202208/raster/epsg-4326/{grid_size}/{row_count}/iucn_cat/gdal-geotiff/{tile_id}.tif"
+      "source_uri":"s3://gfw-data-lake/wdpa_protected_areas/v202308/raster/epsg-4326/{grid_size}/{row_count}/iucn_cat/gdal-geotiff/{tile_id}.tif"
     },
     {
       "name":"detailed_wdpa_protected_areas",
@@ -118,7 +118,7 @@
     },
     {
       "name":"gfw_peatlands",
-      "source_uri":"s3://gfw-data-lake/gfw_peatlands/v20200807/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha/gdal-geotiff/{tile_id}.tif"
+      "source_uri":"s3://gfw-data-lake/gfw_peatlands/v20230315/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha/gdal-geotiff/{tile_id}.tif"
     },
     {
       "name":"gfw_deadwood_carbon",
@@ -230,7 +230,7 @@
     },
     {
       "name":"gfw_planted_forests",
-      "source_uri":"s3://gfw-data-lake/gfw_planted_forests/v20201209/raster/epsg-4326/{grid_size}/{row_count}/type/gdal-geotiff/{tile_id}.tif"
+      "source_uri":"s3://gfw-data-lake/gfw_planted_forests/v20230911/raster/epsg-4326/{grid_size}/{row_count}/type/gdal-geotiff/{tile_id}.tif"
     },
     {
       "name":"per_forest_concessions",

src/main/scala/org/globalforestwatch/layers/PlantedForests.scala

@@ -9,16 +9,17 @@ case class PlantedForests(gridTile: GridTile, kwargs: Map[String, Any]) extends
 
   def lookup(value: Int): String = value match {
     case 1 => "Fruit"
-    case 2 => "Fruit Mix"
-    case 3 => "Oil Palm "
-    case 4 => "Oil Palm Mix"
+    case 2 => "Fruit mix"
+    case 3 => "Oil palm "
+    case 4 => "Oil palm mix"
     case 5 => "Other"
-    case 6 => "Rubber"
-    case 7  => "Rubber Mix"
-    case 8  => "Unknown"
-    case 9  => "Unknown Mix"
-    case 10 => "Wood fiber / Timber"
-    case 11 => "Wood fiber / Timber Mix"
+    case 6 => "Other mix"
+    case 7 => "Rubber"
+    case 8  => "Rubber mix"
+    case 9  => "Unknown"
+    case 10  => "Unknown mix"
+    case 11 => "Wood fiber or timber"
+    case 12 => "Wood fiber or timber Mix"
     case _ => ""
   }
 }

src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticAnalysis.scala

@@ -95,7 +95,7 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis {
                       // March. So, the most recent data relates to soy planted late
                       // in previous year. So, we should only intersect with tree
                       // cover loss from previous year.
-                      tree_cover_loss_soy_yearly = data.tree_cover_loss_soy_yearly.limitToMaxYear(2021)
+                      tree_cover_loss_soy_yearly = data.tree_cover_loss_soy_yearly.limitToMaxYear(2022)
                     )
                   }
                 }
@@ -201,7 +201,7 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis {
         usingIndex = true
       )
 
-    // This fire data is an input to the palm risk tool, so limit data to 2021 to sync
+    // This fire data is an input to the palm risk tool, so limit data to 2022 to sync
     // with the palm risk tool.
     joinedRDD.rdd
       .map { case (poly, points) =>
@@ -220,7 +220,7 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis {
       }
       .reduceByKey(_ merge _)
       .mapValues { fires =>
-        aggregateFireData(fires.merge(ForestChangeDiagnosticDataLossYearly.prefilled)).limitToMaxYear(2021)
+        aggregateFireData(fires.merge(ForestChangeDiagnosticDataLossYearly.prefilled)).limitToMaxYear(2022)
       }
   }
 

src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticData.scala

@@ -182,12 +182,12 @@ case class ForestChangeDiagnosticData(
     */
   def withUpdatedCommodityRisk(): ForestChangeDiagnosticData = {
 
-    /* Exclude the last year, limit data to 2021 to sync with palm risk tool:
+    /* Exclude the last year, limit data to 2022 to sync with palm risk tool:
     commodity_threat_deforestation, commodity_threat_peat, commodity_threat_protected_areas use year n and year n-1.
     Including information from the current year would under-represent these values as it's in progress.
     */
     val minLossYear = ForestChangeDiagnosticDataLossYearly.prefilled.value.keys.min
-    val maxLossYear = 2021
+    val maxLossYear = 2022
     val years: List[Int] = List.range(minLossYear + 1, maxLossYear + 1)
 
     val forestValueIndicator: ForestChangeDiagnosticDataValueYearly =