diff --git a/src/main/resources/raster-catalog-default.json b/src/main/resources/raster-catalog-default.json index 53869cfc..d7137fc7 100644 --- a/src/main/resources/raster-catalog-default.json +++ b/src/main/resources/raster-catalog-default.json @@ -10,7 +10,7 @@ }, { "name":"wdpa_protected_areas", - "source_uri":"s3://gfw-data-lake/wdpa_protected_areas/v202407/raster/epsg-4326/{grid_size}/{row_count}/iucn_cat/geotiff/{tile_id}.tif" + "source_uri":"s3://gfw-data-lake/wdpa_protected_areas/v202407.2/raster/epsg-4326/{grid_size}/{row_count}/iucn_cat/geotiff/{tile_id}.tif" }, { "name":"gfw_oil_gas", diff --git a/src/main/scala/org/globalforestwatch/summarystats/annualupdate_minimal/AnnualUpdateMinimalDF.scala b/src/main/scala/org/globalforestwatch/summarystats/annualupdate_minimal/AnnualUpdateMinimalDF.scala index 19f0a557..97c757ba 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/annualupdate_minimal/AnnualUpdateMinimalDF.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/annualupdate_minimal/AnnualUpdateMinimalDF.scala @@ -261,9 +261,9 @@ object AnnualUpdateMinimalDF { max($"is__gfw_wood_fiber") as "is__gfw_wood_fiber", max($"is__gfw_resource_rights") as "is__gfw_resource_rights", max($"is__gfw_managed_forests") as "is__gfw_managed_forests", - max($"umd_tree_cover_gain__period") as "umd_tree_cover_gain__period", + max(length($"umd_tree_cover_gain__period")).cast("boolean") as "umd_tree_cover_gain__period", max($"is__ifl_intact_forest_landscapes_2000") as "is__ifl_intact_forest_landscapes_2000", - max($"sbtn_natural_forests__class") as "sbtn_natural_forests__class", + max(length($"sbtn_natural_forests__class")).cast("boolean") as "sbtn_natural_forests__class", max(length($"tsc_tree_cover_loss_drivers__type")).cast("boolean") as "tsc_tree_cover_loss_drivers__type", max($"is__birdlife_alliance_for_zero_extinction_site") as "is__birdlife_alliance_for_zero_extinction_site", diff --git a/src/main/scala/org/globalforestwatch/summarystats/firealerts/FireAlertsDF.scala b/src/main/scala/org/globalforestwatch/summarystats/firealerts/FireAlertsDF.scala index 8601ad3c..9762c2ea 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/firealerts/FireAlertsDF.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/firealerts/FireAlertsDF.scala @@ -206,7 +206,7 @@ object FireAlertsDF { max("is__gmw_global_mangrove_extent_2020") as "is__gmw_global_mangrove_extent_2020", max("is__ifl_intact_forest_landscapes_2016") as "is__ifl_intact_forest_landscapes_2016", max(length($"ibge_bra_biomes__name")).cast("boolean") as "ibge_bra_biomes__name", - max("sbtn_natural_forests__class") as "sbtn_natural_forests__class", + max(length($"sbtn_natural_forests__class")).cast("boolean") as "sbtn_natural_forests__class", max("is__birdlife_alliance_for_zero_extinction_site") as "is__birdlife_alliance_for_zero_extinction_site", max("is__birdlife_key_biodiversity_area") as "is__birdlife_key_biodiversity_area", diff --git a/src/main/scala/org/globalforestwatch/summarystats/gladalerts/GladAlertsDF.scala b/src/main/scala/org/globalforestwatch/summarystats/gladalerts/GladAlertsDF.scala index a9faf056..788fe4c4 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/gladalerts/GladAlertsDF.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/gladalerts/GladAlertsDF.scala @@ -188,7 +188,7 @@ object GladAlertsDF { max("is__gmw_mangroves_2020") as "is__gmw_mangroves_2020", max("is__ifl_intact_forest_landscape_2016") as "is__ifl_intact_forest_landscape_2016", max(length($"bra_biome__name")).cast("boolean") as "bra_biome__name", - max("sbtn_natural_forests") as "sbtn_natural_forests__class", + max(length($"sbtn_natural_forests__class")).cast("boolean") as "sbtn_natural_forests__class", ) val aggCols = diff --git a/src/main/scala/org/globalforestwatch/summarystats/integrated_alerts/IntegratedAlertsDF.scala b/src/main/scala/org/globalforestwatch/summarystats/integrated_alerts/IntegratedAlertsDF.scala index 32a50d62..083577af 100644 --- a/src/main/scala/org/globalforestwatch/summarystats/integrated_alerts/IntegratedAlertsDF.scala +++ b/src/main/scala/org/globalforestwatch/summarystats/integrated_alerts/IntegratedAlertsDF.scala @@ -190,7 +190,8 @@ object IntegratedAlertsDF { .cast("boolean") as "per_forest_concession__type", max("is__gmw_mangroves_2020") as "is__gmw_mangroves_2020", max("is__ifl_intact_forest_landscape_2016") as "is__ifl_intact_forest_landscape_2016", - max(length($"bra_biome__name")).cast("boolean") as "bra_biome__name" + max(length($"bra_biome__name")).cast("boolean") as "bra_biome__name", + max(length($"sbtn_natural_forests__class")).cast("boolean") as "sbtn_natural_forests__class" ) val aggCols =