Corrected some carbon data uris.

wri · Nov 3, 2023 · 9135652 · 9135652
1 parent 0a41e42
commit 9135652
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 70 deletions.
diff --git a/src/main/resources/raster-catalog-default.json b/src/main/resources/raster-catalog-default.json
@@ -262,14 +262,6 @@
       "name":"gfw_belowground_carbon",
       "source_uri":"s3://gfw-data-lake/gfw_belowground_carbon/v20230322/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha-1/geotiff/{tile_id}.tif"
     },
-    {
-      "name":"gfw_deadwood_carbon",
-      "source_uri":"s3://gfw-data-lake/gfw_deadwood_carbon/v20200824/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha-1/geotiff/{tile_id}.tif"
-    },
-    {
-      "name":"gfw_litter_carbon",
-      "source_uri":"s3://gfw-data-lake/gfw_litter_carbon/v20200824/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha-1/geotiff/{tile_id}.tif"
-    },
     {
       "name":"gfw_soil_carbon",
       "source_uri": "s3://gfw-data-lake/gfw_soil_carbon/v20230322.2/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2_ha-1/geotiff/{tile_id}.tif"
@@ -287,11 +279,11 @@
       "source_uri": "s3://gfw-data-lake/gfw_full_extent_belowground_gross_removals/v20230331/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2e_ha-1/geotiff/{tile_id}.tif"
     },
     {
-      "name":"gfw_full_extent_co2_gross_emissions",
+      "name":"gfw_full_extent_co2_gross_emissions_biomass_soil",
       "source_uri": "s3://gfw-data-lake/gfw_full_extent_co2_gross_emissions/v20230407/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2e_ha-1/geotiff/{tile_id}.tif"
     },
     {
-      "name":"gfw_full_extent_non_co2_gross_emissions",
+      "name":"gfw_full_extent_non_co2_gross_emissions_biomass_soil",
       "source_uri": "s3://gfw-data-lake/gfw_full_extent_non_co2_gross_emissions/v20230407/raster/epsg-4326/{grid_size}/{row_count}/Mg_CO2e_ha-1/geotiff/{tile_id}.tif"
     }
   ]

diff --git a/src/main/scala/org/globalforestwatch/layers/DeadwoodCarbon2000.scala b/src/main/scala/org/globalforestwatch/layers/DeadwoodCarbon2000.scala
@@ -6,16 +6,16 @@ case class DeadwoodCarbon2000(gridTile: GridTile, model: String = "standard", kw
   extends FloatLayer
     with OptionalFLayer {
 
-  val datasetName = "gfw_deadwood_carbon"
+//  val datasetName = "gfw_deadwood_carbon"
+//
+//  val uri: String =
+//    uriForGrid(gridTile, kwargs)
 
-  val uri: String =
-    uriForGrid(gridTile, kwargs)
 
+  // For carbonflux package run only
+  val datasetName = "Na"
 
-//  // For carbonflux package run only
-//  val datasetName = "Na"
-//
-//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
-//  val uri: String =
-//    s"s3://gfw-files/flux_1_2_3/deadwood_carbon_2000/$model_suffix/${gridTile.tileId}.tif"
+  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+  val uri: String =
+    s"s3://gfw-files/flux_1_2_3/deadwood_carbon_2000/$model_suffix/${gridTile.tileId}.tif"
 }
diff --git a/src/main/scala/org/globalforestwatch/layers/Ecozones.scala b/src/main/scala/org/globalforestwatch/layers/Ecozones.scala
diff --git a/src/main/scala/org/globalforestwatch/layers/GrossEmissionsCo2OnlyCo2BiomassSoil.scala b/src/main/scala/org/globalforestwatch/layers/GrossEmissionsCo2OnlyCo2BiomassSoil.scala
@@ -6,7 +6,7 @@ case class GrossEmissionsCo2OnlyCo2BiomassSoil(gridTile: GridTile, model: String
   extends FloatLayer
     with OptionalFLayer {
 
-  val datasetName = "gfw_full_extent_co2_gross_emissions"
+  val datasetName = "gfw_full_extent_co2_gross_emissions_biomass_soil"
 
   val uri: String =
     uriForGrid(gridTile, kwargs)

diff --git a/src/main/scala/org/globalforestwatch/layers/GrossEmissionsNonCo2Co2eBiomassSoil.scala b/src/main/scala/org/globalforestwatch/layers/GrossEmissionsNonCo2Co2eBiomassSoil.scala
@@ -6,7 +6,7 @@ case class GrossEmissionsNonCo2Co2eBiomassSoil(gridTile: GridTile, model: String
   extends FloatLayer
     with OptionalFLayer {
 
-  val datasetName = "gfw_full_extent_non_co2_gross_emissions"
+  val datasetName = "gfw_full_extent_non_co2_gross_emissions_biomass_soil"
 
   val uri: String =
     uriForGrid(gridTile, kwargs)

diff --git a/src/main/scala/org/globalforestwatch/layers/SoilCarbon2000.scala b/src/main/scala/org/globalforestwatch/layers/SoilCarbon2000.scala
@@ -6,16 +6,16 @@ case class SoilCarbon2000(gridTile: GridTile, model: String = "standard", kwargs
   extends FloatLayer
     with OptionalFLayer {
 
-  //  val datasetName = "gfw_soil_carbon"
-  //
-  //  val uri: String =
-  //    uriForGrid(gridTile, kwargs)
+    val datasetName = "gfw_soil_carbon"
 
+    val uri: String =
+      uriForGrid(gridTile, kwargs)
 
-  // For carbonflux package run only
-  val datasetName = "Na"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
-  val uri: String =
-    s"s3://gfw-files/flux_1_2_3/soil_carbon_2000/standard/${gridTile.tileId}.tif"
+//  // For carbonflux package run only
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/soil_carbon_2000/standard/${gridTile.tileId}.tif"
 }