From 6a2e2aa80441e2854b820d4481b7485f2a6ef8e8 Mon Sep 17 00:00:00 2001 From: Justin Terry Date: Tue, 1 Mar 2022 15:24:10 -0800 Subject: [PATCH] Increase max year to 2020 --- .../org/globalforestwatch/summarystats/SummaryCommand.scala | 4 ++-- .../ForestChangeDiagnosticAnalysis.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/org/globalforestwatch/summarystats/SummaryCommand.scala b/src/main/scala/org/globalforestwatch/summarystats/SummaryCommand.scala index 833541f3..ca99393e 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/SummaryCommand.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/SummaryCommand.scala @@ -117,8 +117,8 @@ trait SummaryCommand { val gladOpt: Opts[Boolean] = Opts.flag("glad", "GLAD tile extent").orFalse val fireAlertTypeOpt: Opts[String] = Opts - .option[String]("fire_alert_type", help = "MODIS or VIIRS") - .withDefault("VIIRS") + .option[String]("fire_alert_type", help = "modis or viirs") + .withDefault("viirs") val fireAlertSourceOpt: Opts[NonEmptyList[String]] = Opts .options[String]( diff --git a/src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticAnalysis.scala b/src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticAnalysis.scala index 2f163ce3..523b707e 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticAnalysis.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/forest_change_diagnostic/ForestChangeDiagnosticAnalysis.scala @@ -78,7 +78,7 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis { .mapValues { case (data, fire) => data.copy( commodity_threat_fires = fire.getOrElse(ForestChangeDiagnosticDataLossYearly.empty), - tree_cover_loss_soy_yearly = data.tree_cover_loss_soy_yearly.limitToMaxYear(2019) + tree_cover_loss_soy_yearly = data.tree_cover_loss_soy_yearly.limitToMaxYear(2020) ) } } @@ -190,7 +190,7 @@ object ForestChangeDiagnosticAnalysis extends SummaryAnalysis { } .reduceByKey(_ merge _) .mapValues { fires => - aggregateFireData(fires.merge(ForestChangeDiagnosticDataLossYearly.prefilled)).limitToMaxYear(2019) + aggregateFireData(fires.merge(ForestChangeDiagnosticDataLossYearly.prefilled)).limitToMaxYear(2020) } }