allow to choose TCD year

Signed-off-by: Thomas Maschler <tmaschler@wri.org>
wri · Jul 22, 2019 · a54746b · a54746b
1 parent 57af860
commit a54746b
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 521 deletions.
diff --git a/src/main/scala/org/globalforestwatch/annualupdate/TreeLossRDD.scala b/src/main/scala/org/globalforestwatch/annualupdate/TreeLossRDD.scala
@@ -28,7 +28,8 @@ object TreeLossRDD extends AnalysisRDD {
 
   def runPolygonalSummary(raster: Raster[TILE],
                           geometry: Geometry,
-                          options: Rasterizer.Options): SUMMARY = {
+                          options: Rasterizer.Options,
+                          tcdYear: Int = 2000): SUMMARY = {
     raster.polygonalSummary(
       geometry = geometry,
       emptyResult = new TreeLossSummary(),

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss/DF.scala b/src/main/scala/org/globalforestwatch/treecoverloss/DF.scala
@@ -17,6 +17,7 @@ object DF {
       Seq(
         "feature_id",
         "threshold",
+        "tcd_year",
         "primary_forest",
         "extent_2000",
         "extent_2010",
@@ -32,6 +33,7 @@ object DF {
     df.select(
       $"feature_id",
       $"threshold",
+      $"tcd_year",
       $"primary_forest",
       $"extent_2000",
       $"extent_2010",
@@ -172,7 +174,7 @@ object DF {
   def primaryForestFilter(include: Boolean)(df: DataFrame): DataFrame = {
     if (include) df
     else {
-      df.groupBy($"feature_id", $"threshold")
+      df.groupBy($"feature_id", $"threshold", $"tcd_year")
         .agg(
           sum("total_area") as "total_area",
           sum("extent_2000") as "extent_2000",

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossRDD.scala b/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossRDD.scala
@@ -32,7 +32,7 @@ object TreeLossRDD extends AnalysisRDD {
                           tcdYear: Int): SUMMARY = {
     raster.polygonalSummary(
       geometry = geometry,
-      emptyResult = new TreeLossSummary(),
+      emptyResult = new TreeLossSummary(tcdYear),
       options = options
     )
   }

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossRow.scala b/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossRow.scala
@@ -3,6 +3,7 @@ package org.globalforestwatch.treecoverloss
 case class TreeLossRow(
                         featureId: Int,
                         threshold: Int,
+                        tcdYear: Int,
                         primaryForest: Boolean,
                         extent2000: Double,
                         extent2010: Double,

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossSparkSession.scala b/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossSparkSession.scala
@@ -15,6 +15,7 @@ object TreeLossSparkSession {
 
     val localConf: SparkConf = conf
       .setIfMissing("spark.master", "local[*]")
+      .set("spark.driver.bindAddress", "127.0.0.1")
 
     implicit val spark: SparkSession = try {
       SparkSession.builder.config(conf).getOrCreate

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossSummaryMain.scala b/src/main/scala/org/globalforestwatch/treecoverloss/TreeLossSummaryMain.scala
@@ -139,6 +139,7 @@ object TreeLossSummaryMain
                       TreeLossRow(
                         id.cell_id,
                         lossDataGroup.threshold,
+                        tcdYear,
                           lossDataGroup.primaryForest,
                         lossData.extent2000,
                         lossData.extent2010,
@@ -155,6 +156,7 @@ object TreeLossSummaryMain
               .toDF(
                 "feature_id",
                 "threshold",
+                "tcd_year",
                 "primary_forest",
                 "extent_2000",
                 "extent_2010",

diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/DF.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/DF.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossData.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossData.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossDataGroup.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossDataGroup.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossGrid.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossGrid.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossGridSources.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossGridSources.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRDD.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRDD.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRow.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRow.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRowFeatureId.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossRowFeatureId.scala
diff --git a/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossSparkSession.scala b/src/main/scala/org/globalforestwatch/treecoverloss_simple_60/TreeLossSparkSession.scala