Merge pull request #182 from wri/develop

Merge to master

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

@@ -190,7 +190,7 @@
     },
     {
       "name":"umd_tree_cover_loss",
-      "source_uri":"s3://gfw-data-lake/umd_tree_cover_loss/v1.9/raster/epsg-4326/{grid_size}/{row_count}/year/gdal-geotiff/{tile_id}.tif"
+      "source_uri":"s3://gfw-data-lake/umd_tree_cover_loss/v1.10/raster/epsg-4326/{grid_size}/{row_count}/year/gdal-geotiff/{tile_id}.tif"
     },
     {
       "name":"gfw_managed_forests",

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

@@ -91,6 +91,10 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis {
                   } else {
                     data.copy(
                       commodity_threat_fires = fire.getOrElse(ForestChangeDiagnosticDataLossYearly.empty),
+                      // Soy is planted late in year (Sept/Oct) and harvested in
+                      // 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)
                     )
                   }
@@ -197,6 +201,8 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis {
         usingIndex = true
       )
 
+    // This fire data is an input to the palm risk tool, so limit data to 2021 to sync
+    // with the palm risk tool.
     joinedRDD.rdd
       .map { case (poly, points) =>
         val fid = poly.getUserData.asInstanceOf[FeatureId]

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

@@ -56,6 +56,7 @@ object ForestChangeDiagnosticDataLossYearly {
         2019 -> 0,
         2020 -> 0,
         2021 -> 0,
+        2022 -> 0,
       )
     )
 

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

@@ -78,6 +78,7 @@ object ForestChangeDiagnosticDataValueYearly {
         2019 -> 0,
         2020 -> 0,
         2021 -> 0,
+        2022 -> 0,
       )
     )