openforis-whisp 1.0.0a1__py3-none-any.whl → 2.0.0a2__py3-none-any.whl

openforis_whisp/datasets.py

@@ -1,3 +1,15 @@
+# This file contains python code for the Google Earth Engine datasets used in the Whisp pacakge.
+
+# If you are running a bespoke analysis including your own datasets see also the main README.md file.
+
+# Key aspects to include in the code for each function are:
+# a) a suffix of ' _prep' and
+# b) a prefix of "nXX_" if it is national/sub-national dataset (where XX is replaced by that country code), or a prefix of 'g_' if it covers more than one country.
+# c) a name for your image, defined by ".rename('add_your_image_name_here')". This becomes the column header in the output table.
+
+# NB for all  the above you will need to be running the package in editable mode for these local changes to take effect.
+# Editable mode runs the package locally and thus changes to any files are reflected immediately.
+
 import ee
 
 # ee.Authenticate()
@@ -32,7 +44,7 @@ def get_logger(name):
 
 
 # ESA_TC_2020
-def esa_worldcover_trees_prep():
+def g_esa_worldcover_trees_prep():
     esa_worldcover_2020_raw = ee.Image("ESA/WorldCover/v100/2020")
     esa_worldcover_trees_2020 = esa_worldcover_2020_raw.eq(95).Or(
         esa_worldcover_2020_raw.eq(10)
@@ -41,25 +53,27 @@ def esa_worldcover_trees_prep():
 
 
 # EUFO_2020
-def jrc_gfc_2020_prep():
+def g_jrc_gfc_2020_prep():
     jrc_gfc2020_raw = ee.ImageCollection("JRC/GFC2020/V2")
     return jrc_gfc2020_raw.mosaic().rename("EUFO_2020")
 
 
-# JAXA_FNF_2020
-def jaxa_forest_prep():
-    jaxa_forest_non_forest_raw = ee.ImageCollection("JAXA/ALOS/PALSAR/YEARLY/FNF4")
-    jaxa_forest_non_forest_2020 = (
-        jaxa_forest_non_forest_raw.filterDate("2020-01-01", "2020-12-31")
-        .select("fnf")
-        .mosaic()
-    )
-    return jaxa_forest_non_forest_2020.lte(2).rename("JAXA_FNF_2020")
+## removing JAXA product due to repeat errors of commission being noted by users, compared to other datasets
+
+# # JAXA_FNF_2020
+# def g_jaxa_forest_prep():
+#     jaxa_forest_non_forest_raw = ee.ImageCollection("JAXA/ALOS/PALSAR/YEARLY/FNF4")
+#     jaxa_forest_non_forest_2020 = (
+#         jaxa_forest_non_forest_raw.filterDate("2020-01-01", "2020-12-31")
+#         .select("fnf")
+#         .mosaic()
+#     )
+#     return jaxa_forest_non_forest_2020.lte(2).rename("JAXA_FNF_2020")
 
 
 # GFC_TC_2020
-def glad_gfc_10pc_prep():
-    gfc = ee.Image("UMD/hansen/global_forest_change_2023_v1_11")
+def g_glad_gfc_10pc_prep():
+    gfc = ee.Image("UMD/hansen/global_forest_change_2024_v1_12")
     gfc_treecover2000 = gfc.select(["treecover2000"])
     gfc_loss2001_2020 = gfc.select(["lossyear"]).lte(20)
     gfc_treecover2020 = gfc_treecover2000.where(gfc_loss2001_2020.eq(1), 0)
@@ -67,14 +81,14 @@ def glad_gfc_10pc_prep():
 
 
 # GLAD_Primary
-def glad_pht_prep():
+def g_glad_pht_prep():
     primary_ht_forests2001_raw = ee.ImageCollection(
         "UMD/GLAD/PRIMARY_HUMID_TROPICAL_FORESTS/v1"
     )
     primary_ht_forests2001 = (
         primary_ht_forests2001_raw.select("Primary_HT_forests").mosaic().selfMask()
     )
-    gfc = ee.Image("UMD/hansen/global_forest_change_2023_v1_11")
+    gfc = ee.Image("UMD/hansen/global_forest_change_2024_v1_12")
     gfc_loss2001_2020 = gfc.select(["lossyear"]).lte(20)
     return primary_ht_forests2001.where(gfc_loss2001_2020.eq(1), 0).rename(
         "GLAD_Primary"
@@ -82,9 +96,9 @@ def glad_pht_prep():
 
 
 # TMF_undist (undistrubed forest in 2020)
-def jrc_tmf_undisturbed_prep():
+def g_jrc_tmf_undisturbed_prep():
     TMF_undist_2020 = (
-        ee.ImageCollection("projects/JRC/TMF/v1_2023/AnnualChanges")
+        ee.ImageCollection("projects/JRC/TMF/v1_2024/AnnualChanges")
         .select("Dec2020")
         .mosaic()
         .eq(1)
@@ -93,33 +107,37 @@ def jrc_tmf_undisturbed_prep():
 
 
 # Forest Persistence FDaP
-def fdap_forest_prep():
+def g_fdap_forest_prep():
     fdap_forest_raw = ee.Image(
         "projects/forestdatapartnership/assets/community_forests/ForestPersistence_2020"
     )
     fdap_forest = fdap_forest_raw.gt(0.75)
     return fdap_forest.rename("Forest_FDaP")
 
+
 #########################primary forest
 # EUFO JRC Global forest type - primary
-def gft_primary_prep():
+def g_gft_primary_prep():
     gft_raw = ee.ImageCollection("JRC/GFC2020_subtypes/V0").mosaic()
     gft_primary = gft_raw.eq(10)
     return gft_primary.rename("GFT_primary")
-    
+
+
 # Intact Forest Landscape 2020
-def IFL_2020_prep():
-    IFL_2020 = ee.Image('users/potapovpeter/IFL_2020')
+def g_ifl_2020_prep():
+    IFL_2020 = ee.Image("users/potapovpeter/IFL_2020")
     return IFL_2020.rename("IFL_2020")
 
+
 # European Primary Forest Dataset
-def EPFD_prep():
-    EPFD=ee.FeatureCollection("HU_BERLIN/EPFD/V2/polygons")
-    EPFD_binary = ee.Image().paint(EPFD,1)    
-    return EPFD_binary.rename('European_Primary_Forest')
-    
+def g_epfd_prep():
+    EPFD = ee.FeatureCollection("HU_BERLIN/EPFD/V2/polygons")
+    EPFD_binary = ee.Image().paint(EPFD, 1)
+    return EPFD_binary.rename("European_Primary_Forest")
+
+
 # EUFO JRC Global forest type - naturally regenerating planted/plantation forests
-def gft_nat_reg_prep():
+def g_gft_nat_reg_prep():
     gft_raw = ee.ImageCollection("JRC/GFC2020_subtypes/V0").mosaic()
     gft_nat_reg = gft_raw.eq(1)
     return gft_nat_reg.rename("GFT_naturally_regenerating")
@@ -128,33 +146,36 @@ def gft_nat_reg_prep():
 #########################planted and plantation forests
 
 # EUFO JRC Global forest type - planted/plantation forests
-def gft_plantation_prep():
+def g_gft_plantation_prep():
     gft_raw = ee.ImageCollection("JRC/GFC2020_subtypes/V0").mosaic()
     gft_plantation = gft_raw.eq(20)
     return gft_plantation.rename("GFT_planted_plantation")
-    
-def IIASA_planted_prep():
-    iiasa = ee.Image('projects/sat-io/open-datasets/GFM/FML_v3-2');
+
+
+def g_iiasa_planted_prep():
+    iiasa = ee.Image("projects/sat-io/open-datasets/GFM/FML_v3-2")
     iiasa_PL = iiasa.eq(31).Or(iiasa.eq(32))
-    return iiasa_PL.rename('IIASA_planted_plantation')
-    
+    return iiasa_PL.rename("IIASA_planted_plantation")
+
+
 #########################TMF regrowth in 2023
-def tmf_regrowth_prep():
+def g_tmf_regrowth_prep():
     # Load the TMF Degradation annual product
-    TMF_AC=ee.ImageCollection('projects/JRC/TMF/v1_2023/AnnualChanges').mosaic()
-    TMF_AC_2023=TMF_AC.select('Dec2023')
+    TMF_AC = ee.ImageCollection("projects/JRC/TMF/v1_2024/AnnualChanges").mosaic()
+    TMF_AC_2023 = TMF_AC.select("Dec2023")
     Regrowth_TMF = TMF_AC_2023.eq(4)
-    return Regrowth_TMF.rename('TMF_regrowth_2023')
-    
+    return Regrowth_TMF.rename("TMF_regrowth_2023")
+
+
 ############tree crops
 
 # TMF_plant (plantations in 2020)
-def jrc_tmf_plantation_prep():
+def g_jrc_tmf_plantation_prep():
     transition = ee.ImageCollection(
-        "projects/JRC/TMF/v1_2023/TransitionMap_Subtypes"
+        "projects/JRC/TMF/v1_2024/TransitionMap_Subtypes"
     ).mosaic()
     deforestation_year = ee.ImageCollection(
-        "projects/JRC/TMF/v1_2023/DeforestationYear"
+        "projects/JRC/TMF/v1_2024/DeforestationYear"
     ).mosaic()
     plantation = (transition.gte(81)).And(transition.lte(86))
     plantation_2020 = plantation.where(
@@ -165,7 +186,7 @@ def jrc_tmf_plantation_prep():
 
 # # Oil_palm_Descals
 # NB updated to Descals et al 2024 paper (as opposed to Descals et al 2021 paper)
-def creaf_descals_palm_prep():
+def g_creaf_descals_palm_prep():
     # Load the Global Oil Palm Year of Plantation image and mosaic it
     img = (
         ee.ImageCollection(
@@ -182,103 +203,127 @@ def creaf_descals_palm_prep():
     plantation_2020 = oil_palm_plantation_year.lte(2020).selfMask()
     return plantation_2020.rename("Oil_palm_Descals")
 
-    # Calculate the year of plantation
-    oil_palm_plantation_year = img.divide(365).add(1970).floor().lte(2020)
-
-    # Create a mask for plantations in the year 2020 or earlier
-    plantation_2020 = oil_palm_plantation_year.lte(2020).selfMask()
-    return plantation_2020.rename("Oil_palm_Descals")
-
 
 # Cocoa_ETH
-def eth_kalischek_cocoa_prep():
+def g_eth_kalischek_cocoa_prep():
     return ee.Image("projects/ee-nk-cocoa/assets/cocoa_map_threshold_065").rename(
         "Cocoa_ETH"
     )
 
 
+# fdap datasets
+
+# Thresholds and model info here https://github.com/google/forest-data-partnership/blob/main/models/README.md
+
 # Oil Palm FDaP
-def fdap_palm_prep():
+def g_fdap_palm_prep():
     fdap_palm2020_model_raw = ee.ImageCollection(
-        "projects/forestdatapartnership/assets/palm/model_2024a"
+        "projects/forestdatapartnership/assets/palm/model_2025a"
     )
     fdap_palm = (
         fdap_palm2020_model_raw.filterDate("2020-01-01", "2020-12-31")
         .mosaic()
-        .gt(0.83)  # Threshold for Oil Palm
+        .gt(0.88)  # Precision and recall ~78% at 0.88 threshold.
     )
     return fdap_palm.rename("Oil_palm_FDaP")
 
-def fdap_palm_2023_prep():
-    fdap_palm2020_model_raw = ee.ImageCollection("projects/forestdatapartnership/assets/palm/model_2024a")
+
+def g_fdap_palm_2023_prep():
+    fdap_palm2020_model_raw = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/palm/model_2025a"
+    )
     fdap_palm = (
-        fdap_palm2020_model_raw
-        .filterDate('2023-01-01', '2023-12-31')
+        fdap_palm2020_model_raw.filterDate("2023-01-01", "2023-12-31")
         .mosaic()
-        .gt(0.83)  # Threshold for Oil Palm
-        
+        .gt(0.88)  # Precision and recall ~78% at 0.88 threshold.
     )
     return fdap_palm.rename("Oil_palm_2023_FDaP")
 
 
+# Cocoa FDaP
+def g_fdap_cocoa_prep():
+    fdap_cocoa2020_model_raw = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/cocoa/model_2025a"
+    )
+    fdap_cocoa = (
+        fdap_cocoa2020_model_raw.filterDate("2020-01-01", "2020-12-31")
+        .mosaic()
+        .gt(0.96)  # Precision and recall ~87% 0.96 threshold.
+    )
+    return fdap_cocoa.rename("Cocoa_FDaP")
+
+
+def g_fdap_cocoa_2023_prep():
+    fdap_cocoa2020_model_raw = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/cocoa/model_2025a"
+    )
+    fdap_cocoa = (
+        fdap_cocoa2020_model_raw.filterDate("2023-01-01", "2023-12-31")
+        .mosaic()
+        .gt(0.96)  # Precision and recall ~87% 0.96 threshold.
+    )
+    return fdap_cocoa.rename("Cocoa_2023_FDaP")
+
+
 # Rubber FDaP
-def fdap_rubber_prep():
+def g_fdap_rubber_prep():
     fdap_rubber2020_model_raw = ee.ImageCollection(
-        "projects/forestdatapartnership/assets/rubber/model_2024a"
+        "projects/forestdatapartnership/assets/rubber/model_2025a"
     )
     fdap_rubber = (
         fdap_rubber2020_model_raw.filterDate("2020-01-01", "2020-12-31")
         .mosaic()
-        .gt(0.93)  # Threshold for Rubber
+        .gt(0.59)  # Precision and recall ~80% 0.59 threshold.
     )
     return fdap_rubber.rename("Rubber_FDaP")
 
-def fdap_rubber_2023_prep():
-    fdap_rubber2020_model_raw = ee.ImageCollection("projects/forestdatapartnership/assets/rubber/model_2024a")
+
+def g_fdap_rubber_2023_prep():
+    fdap_rubber2020_model_raw = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/rubber/model_2025a"
+    )
     fdap_rubber = (
-        fdap_rubber2020_model_raw
-        .filterDate('2023-01-01', '2023-12-31')
+        fdap_rubber2020_model_raw.filterDate("2023-01-01", "2023-12-31")
         .mosaic()
         .gt(0.93)  # Threshold for Rubber
-        
     )
     return fdap_rubber.rename("Rubber_2023_FDaP")
 
-# Cocoa FDaP
-def fdap_cocoa_prep():
-    fdap_cocoa2020_model_raw = ee.ImageCollection(
-        "projects/forestdatapartnership/assets/cocoa/model_2024a"
+
+# # Coffee FDaP
+def g_fdap_coffee_2020_prep():
+    # Load the coffee model for 2020
+    collection = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/coffee/model_2025a"
     )
-    fdap_cocoa = (
-        fdap_cocoa2020_model_raw.filterDate("2020-01-01", "2020-12-31")
+
+    # Filter the collection for the year 2020 and create a binary mask
+    coffee_2020 = (
+        collection.filterDate("2020-01-01", "2020-12-31")
         .mosaic()
-        .gt(0.5)  # Threshold for Cocoa
+        .gt(0.99)  # Precision and recall ~54% 0.99 threshold.
     )
-    return fdap_cocoa.rename("Cocoa_FDaP")
 
-def fdap_cocoa_2023_prep():
-    fdap_cocoa2020_model_raw = ee.ImageCollection("projects/forestdatapartnership/assets/cocoa/model_2024a")
-    fdap_cocoa = (
-        fdap_cocoa2020_model_raw
-        .filterDate('2023-01-01', '2023-12-31')
-        .mosaic()
-        .gt(0.5)  # Threshold for Cocoa
-       
+    return coffee_2020.rename("Coffee_FDaP")
+
+
+def g_fdap_coffee_2023_prep():
+    # Load the coffee model for 2020
+    collection = ee.ImageCollection(
+        "projects/forestdatapartnership/assets/coffee/model_2025a"
     )
-    return fdap_cocoa.rename("Cocoa_2023_FDaP")
 
-# Cocoa_bnetd
-def civ_ocs2020_prep():
-    return (
-        ee.Image("BNETD/land_cover/v1/2020")
-        .select("classification")
-        .eq(9)
-        .rename("Cocoa_bnetd")
-    )  # cocoa from national land cover map for Côte d'Ivoire
+    # Filter the collection for the year 2023 and create a binary mask
+    coffee_2023 = (
+        collection.filterDate("2023-01-01", "2023-12-31")
+        .mosaic()
+        .gt(0.99)  # Precision and recall ~54% 0.99 threshold.
+    )
+    return coffee_2023.rename("Coffee_FDaP_2023")
 
 
 # Rubber_RBGE  - from Royal Botanical Gardens of Edinburgh (RBGE) NB for 2021
-def rbge_rubber_prep():
+def g_rbge_rubber_prep():
     return (
         ee.Image(
             "users/wangyxtina/MapRubberPaper/rRubber10m202122_perc1585DifESAdist5pxPF"
@@ -287,45 +332,72 @@ def rbge_rubber_prep():
         .rename("Rubber_RBGE")
     )
 
-################## seasonal crops
 
-#soy 2020 Brazil
-def soy_song_2020_prep():
-    return ee.Image('projects/glad/soy_annual_SA/2020').unmask().rename("Soy_Song_2020")
-##############2023
+# soy 2020 South America
+def g_soy_song_2020_prep():
+    return ee.Image("projects/glad/soy_annual_SA/2020").unmask().rename("Soy_Song_2020")
+
+
+##############
 # ESRI 2023
+
 # ESRI 2023 - Tree Cover
-def esri_2023_TC_prep():
-    esri_lulc10_raw = ee.ImageCollection("projects/sat-io/open-datasets/landcover/ESRI_Global-LULC_10m_TS")
-    esri_lulc10_TC = esri_lulc10_raw.filterDate('2023-01-01', '2023-12-31').mosaic().eq(2)
-    return esri_lulc10_TC.rename('ESRI_2023_TC')
-    
+def g_esri_2023_tc_prep():
+    esri_lulc10_raw = ee.ImageCollection(
+        "projects/sat-io/open-datasets/landcover/ESRI_Global-LULC_10m_TS"
+    )
+    esri_lulc10_TC = (
+        esri_lulc10_raw.filterDate("2023-01-01", "2023-12-31").mosaic().eq(2)
+    )
+    return esri_lulc10_TC.rename("ESRI_2023_TC")
+
+
 # ESRI 2023 - Crop
-def esri_2023_crop_prep():
-    esri_lulc10_raw = ee.ImageCollection("projects/sat-io/open-datasets/landcover/ESRI_Global-LULC_10m_TS")
-    esri_lulc10_crop = esri_lulc10_raw.filterDate('2023-01-01', '2023-12-31').mosaic().eq(5)
-    return esri_lulc10_crop.rename('ESRI_2023_crop')
+def g_esri_2023_crop_prep():
+    esri_lulc10_raw = ee.ImageCollection(
+        "projects/sat-io/open-datasets/landcover/ESRI_Global-LULC_10m_TS"
+    )
+    esri_lulc10_crop = (
+        esri_lulc10_raw.filterDate("2023-01-01", "2023-12-31").mosaic().eq(5)
+    )
+    return esri_lulc10_crop.rename("ESRI_2023_crop")
+
 
 # GLC_FCS30D 2022
 
 # GLC_FCS30D Tree Cover
 # forest classes + swamp + mangrove / what to do with shrubland?
-def GLC_FCS30D_TC_2022_prep():
-    GLC_FCS30D = ee.ImageCollection("projects/sat-io/open-datasets/GLC-FCS30D/annual").mosaic().select(22)
-    GLC_FCS30D_TC = (GLC_FCS30D.gte(51)).And(GLC_FCS30D.lte(92)).Or(GLC_FCS30D.eq(181)).Or(GLC_FCS30D.eq(185))
-    return GLC_FCS30D_TC.rename('GLC_FCS30D_TC_2022')
+def g_glc_fcs30d_tc_2022_prep():
+    GLC_FCS30D = (
+        ee.ImageCollection("projects/sat-io/open-datasets/GLC-FCS30D/annual")
+        .mosaic()
+        .select(22)
+    )
+    GLC_FCS30D_TC = (
+        (GLC_FCS30D.gte(51))
+        .And(GLC_FCS30D.lte(92))
+        .Or(GLC_FCS30D.eq(181))
+        .Or(GLC_FCS30D.eq(185))
+    )
+    return GLC_FCS30D_TC.rename("GLC_FCS30D_TC_2022")
+
 
 # GLC_FCS30D crop
-# 10	Rainfed cropland; 11	Herbaceous cover; 12	Tree or shrub cover (Orchard); 20	Irrigated cropland	
-def GLC_FCS30D_crop_2022_prep():
-    GLC_FCS30D = ee.ImageCollection("projects/sat-io/open-datasets/GLC-FCS30D/annual").mosaic().select(22)
+# 10	Rainfed cropland; 11	Herbaceous cover; 12	Tree or shrub cover (Orchard); 20	Irrigated cropland
+def g_glc_fcs30d_crop_2022_prep():
+    GLC_FCS30D = (
+        ee.ImageCollection("projects/sat-io/open-datasets/GLC-FCS30D/annual")
+        .mosaic()
+        .select(22)
+    )
     GLC_FCS30D_crop = GLC_FCS30D.gte(10).And(GLC_FCS30D.lte(20))
-    return GLC_FCS30D_crop.rename('GLC_FCS30D_crop_2022')
-    
+    return GLC_FCS30D_crop.rename("GLC_FCS30D_crop_2022")
+
+
 #### disturbances by year
 
 # RADD_year_2019 to RADD_year_< current year >
-def radd_year_prep():
+def g_radd_year_prep():
     from datetime import datetime
 
     radd = ee.ImageCollection("projects/radar-wur/raddalert/v1")
@@ -363,12 +435,12 @@ def radd_year_prep():
 
 
 # TMF_def_2000 to TMF_def_2023
-def tmf_def_per_year_prep():
+def g_tmf_def_per_year_prep():
     # Load the TMF Deforestation annual product
-    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2023/DeforestationYear").mosaic()
+    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2024/DeforestationYear").mosaic()
     img_stack = None
     # Generate an image based on GFC with one band of forest tree loss per year from 2001 to 2022
-    for i in range(0, 23 + 1):
+    for i in range(0, 24 + 1):
         tmf_def_year = tmf_def.eq(2000 + i).rename("TMF_def_" + str(2000 + i))
         if img_stack is None:
             img_stack = tmf_def_year
@@ -378,12 +450,12 @@ def tmf_def_per_year_prep():
 
 
 # TMF_deg_2000 to TMF_deg_2023
-def tmf_deg_per_year_prep():
+def g_tmf_deg_per_year_prep():
     # Load the TMF Degradation annual product
-    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2023/DegradationYear").mosaic()
+    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2024/DegradationYear").mosaic()
     img_stack = None
     # Generate an image based on GFC with one band of forest tree loss per year from 2001 to 2022
-    for i in range(0, 23 + 1):
+    for i in range(0, 24 + 1):
         tmf_def_year = tmf_def.eq(2000 + i).rename("TMF_deg_" + str(2000 + i))
         if img_stack is None:
             img_stack = tmf_def_year
@@ -393,12 +465,12 @@ def tmf_deg_per_year_prep():
 
 
 # GFC_loss_year_2001 to GFC_loss_year_2023 (correct for version 11)
-def glad_gfc_loss_per_year_prep():
+def g_glad_gfc_loss_per_year_prep():
     # Load the Global Forest Change dataset
-    gfc = ee.Image("UMD/hansen/global_forest_change_2023_v1_11")
+    gfc = ee.Image("UMD/hansen/global_forest_change_2024_v1_12")
     img_stack = None
     # Generate an image based on GFC with one band of forest tree loss per year from 2001 to 2022
-    for i in range(1, 23 + 1):
+    for i in range(1, 24 + 1):
         gfc_loss_year = (
             gfc.select(["lossyear"]).eq(i).And(gfc.select(["treecover2000"]).gt(10))
         )
@@ -411,7 +483,7 @@ def glad_gfc_loss_per_year_prep():
 
 
 # MODIS_fire_2000 to MODIS_fire_< current year >
-def modis_fire_prep():
+def g_modis_fire_prep():
     modis_fire = ee.ImageCollection("MODIS/061/MCD64A1")
     start_year = 2000
 
@@ -438,7 +510,7 @@ def modis_fire_prep():
 
 
 # ESA_fire_2000 to ESA_fire_2020
-def esa_fire_prep():
+def g_esa_fire_prep():
     esa_fire = ee.ImageCollection("ESA/CCI/FireCCI/5_1")
     start_year = 2001
 
@@ -555,7 +627,7 @@ def esa_fire_prep():
 #### disturbances combined (split into before and after 2020)
 
 # RADD_after_2020
-def radd_after_2020_prep():
+def g_radd_after_2020_prep():
     from datetime import datetime
 
     radd = ee.ImageCollection("projects/radar-wur/raddalert/v1")
@@ -580,7 +652,7 @@ def radd_after_2020_prep():
 
 
 # RADD_before_2020
-def radd_before_2020_prep():
+def g_radd_before_2020_prep():
     from datetime import datetime
 
     radd = ee.ImageCollection("projects/radar-wur/raddalert/v1")
@@ -626,33 +698,33 @@ def radd_before_2020_prep():
 
 
 # TMF_deg_before_2020
-def tmf_deg_before_2020_prep():
-    tmf_deg = ee.ImageCollection("projects/JRC/TMF/v1_2023/DegradationYear").mosaic()
+def g_tmf_deg_before_2020_prep():
+    tmf_deg = ee.ImageCollection("projects/JRC/TMF/v1_2024/DegradationYear").mosaic()
     return (tmf_deg.lte(2020)).And(tmf_deg.gte(2000)).rename("TMF_deg_before_2020")
 
 
 # TMF_deg_after_2020
-def tmf_deg_after_2020_prep():
-    tmf_deg = ee.ImageCollection("projects/JRC/TMF/v1_2023/DegradationYear").mosaic()
+def g_tmf_deg_after_2020_prep():
+    tmf_deg = ee.ImageCollection("projects/JRC/TMF/v1_2024/DegradationYear").mosaic()
     return tmf_deg.gt(2020).rename("TMF_deg_after_2020")
 
 
 # tmf_def_before_2020
-def tmf_def_before_2020_prep():
-    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2023/DeforestationYear").mosaic()
+def g_tmf_def_before_2020_prep():
+    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2024/DeforestationYear").mosaic()
     return (tmf_def.lte(2020)).And(tmf_def.gte(2000)).rename("TMF_def_before_2020")
 
 
 # tmf_def_after_2020
-def tmf_def_after_2020_prep():
-    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2023/DeforestationYear").mosaic()
+def g_tmf_def_after_2020_prep():
+    tmf_def = ee.ImageCollection("projects/JRC/TMF/v1_2024/DeforestationYear").mosaic()
     return tmf_def.gt(2020).rename("TMF_def_after_2020")
 
 
 # GFC_loss_before_2020 (loss within 10 percent cover; includes 2020; correct for version 11)
-def glad_gfc_loss_before_2020_prep():
+def g_glad_gfc_loss_before_2020_prep():
     # Load the Global Forest Change dataset
-    gfc = ee.Image("UMD/hansen/global_forest_change_2023_v1_11")
+    gfc = ee.Image("UMD/hansen/global_forest_change_2024_v1_12")
     gfc_loss = (
         gfc.select(["lossyear"]).lte(20).And(gfc.select(["treecover2000"]).gt(10))
     )
@@ -660,15 +732,15 @@ def glad_gfc_loss_before_2020_prep():
 
 
 # GFC_loss_after_2020 (loss within 10 percent cover; correct for version 11)
-def glad_gfc_loss_after_2020_prep():
+def g_glad_gfc_loss_after_2020_prep():
     # Load the Global Forest Change dataset
-    gfc = ee.Image("UMD/hansen/global_forest_change_2023_v1_11")
+    gfc = ee.Image("UMD/hansen/global_forest_change_2024_v1_12")
     gfc_loss = gfc.select(["lossyear"]).gt(20).And(gfc.select(["treecover2000"]).gt(10))
     return gfc_loss.rename("GFC_loss_after_2020")
 
 
 # MODIS_fire_before_2020
-def modis_fire_before_2020_prep():
+def g_modis_fire_before_2020_prep():
     modis_fire = ee.ImageCollection("MODIS/061/MCD64A1")
     start_year = 2000
     end_year = 2020
@@ -684,7 +756,7 @@ def modis_fire_before_2020_prep():
 
 
 # MODIS_fire_after_2020
-def modis_fire_after_2020_prep():
+def g_modis_fire_after_2020_prep():
     modis_fire = ee.ImageCollection("MODIS/061/MCD64A1")
     start_year = 2021
     end_year = datetime.now().year
@@ -700,7 +772,7 @@ def modis_fire_after_2020_prep():
 
 
 # ESA_fire_before_2020
-def esa_fire_before_2020_prep():
+def g_esa_fire_before_2020_prep():
     esa_fire = ee.ImageCollection("ESA/CCI/FireCCI/5_1")
     start_year = 2000
     end_year = 2020
@@ -714,37 +786,489 @@ def esa_fire_before_2020_prep():
         .rename("ESA_fire_before_2020")
     )
 
+
 #########################logging concessions
-#http://data.globalforestwatch.org/datasets?q=logging&sort_by=relevance
-def logging_concessions_prep():
-    RCA=ee.FeatureCollection('projects/ee-whisp/assets/logging/RCA_Permis_dExploitation_et_dAmenagement')
-    RCA_binary = ee.Image().paint(RCA,1)
-    CMR=ee.FeatureCollection('projects/ee-whisp/assets/logging/Cameroon_Forest_Management_Units')
-    CMR_binary = ee.Image().paint(CMR,1)
-    Eq_G=ee.FeatureCollection('projects/ee-whisp/assets/logging/Equatorial_Guinea_logging_concessions')
-    Eq_G_binary = ee.Image().paint(Eq_G,1)
-    DRC=ee.FeatureCollection('projects/ee-whisp/assets/logging/DRC_Forest_concession_agreements')
-    DRC_binary = ee.Image().paint(DRC,1)
-    Liberia=ee.FeatureCollection('projects/ee-whisp/assets/logging/Liberia_Forest_Management_Contracts')
-    Liberia_binary = ee.Image().paint(Liberia,1)
-    RoC=ee.FeatureCollection('projects/ee-whisp/assets/logging/Republic_of_the_Congo_logging_concessions')
-    Roc_binary = ee.Image().paint(RoC,1)
-    Sarawak=ee.FeatureCollection('projects/ee-whisp/assets/logging/Sarawak_logging_concessions')
-    Sarawak_binary = ee.Image().paint(Sarawak,1)
-    logging_concessions_binary=ee.ImageCollection([RCA_binary, CMR_binary, Eq_G_binary,DRC_binary,Liberia_binary,Roc_binary,Sarawak_binary]).mosaic()
-    
-    return logging_concessions_binary.rename('GFW_logging')
-
-
-# ###Combining datasets
-
-
-def combine_datasets():
+# http://data.globalforestwatch.org/datasets?q=logging&sort_by=relevance
+def g_logging_concessions_before_2020_prep():
+    RCA = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/RCA_Permis_dExploitation_et_dAmenagement"
+    )
+    RCA_binary = ee.Image().paint(RCA, 1)
+    CMR = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/Cameroon_Forest_Management_Units"
+    )
+    CMR_binary = ee.Image().paint(CMR, 1)
+    Eq_G = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/Equatorial_Guinea_logging_concessions"
+    )
+    Eq_G_binary = ee.Image().paint(Eq_G, 1)
+    DRC = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/DRC_Forest_concession_agreements"
+    )
+    DRC_binary = ee.Image().paint(DRC, 1)
+    Liberia = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/Liberia_Forest_Management_Contracts"
+    )
+    Liberia_binary = ee.Image().paint(Liberia, 1)
+    RoC = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/Republic_of_the_Congo_logging_concessions"
+    )
+    Roc_binary = ee.Image().paint(RoC, 1)
+    Sarawak = ee.FeatureCollection(
+        "projects/ee-whisp/assets/logging/Sarawak_logging_concessions"
+    )
+    Sarawak_binary = ee.Image().paint(Sarawak, 1)
+    logging_concessions_binary = ee.ImageCollection(
+        [
+            RCA_binary,
+            CMR_binary,
+            Eq_G_binary,
+            DRC_binary,
+            Liberia_binary,
+            Roc_binary,
+            Sarawak_binary,
+        ]
+    ).mosaic()
+
+    return logging_concessions_binary.rename("GFW_logging_before_2020")
+
+
+#########################national datasets
+
+# nBR Brazil
+
+# ### nBR Natural forests in 2020:
+
+# %%
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Amazon biome, 2020
+# Subsetting criteria: primary forests (DN=1) and secondary forests (DN=2) // secondary forests are those recovering from deforestation
+# the resulting dataset shows primary and secondary forest cover in 2020 (mostly by August 2020)
+
+##########################primary forests###############################################
+def nbr_terraclass_amz20_primary_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_f = tcamz20.eq(1)
+    return tcamz20_f.rename("nBR_INPE_TC_primary_forest_Amazon_2020")
+
+
+# [Official NFMS dataset] Brazilian Forest Service dataset on natural forest cover from PRODES and TerraClass data, base year 2022
+# Subsetting criteria: ano_desmat > 2020 and nom_class = 'Floresta'
+# the resulting datasets show primary forest cover in 2020 for the Pantanal, Caatinga, Atlantic Forest and Pampa biomes.
+# the resulting dataset shows primary and secondary forest cover in 2020 for the Cerrado biome (TerraClass 2020)
+# For the Amazon, best to use Terraclass 2020 directly, because the BFS used TerraClass 2014.
+
+# Pantanal
+def nbr_bfs_ptn_f20_prep():
+    bfs_fptn20 = ee.FeatureCollection("projects/ee-whisp/assets/NBR/bfs_ptn_2020")
+
+    bfs_fptn20_binary = ee.Image().paint(bfs_fptn20, 1)
+    return bfs_fptn20_binary.rename("nBR_BFS_primary_forest_Pantanal_2020")
+
+
+# Caatinga - filtered with QGIS because the original geodatabase is too large to export as a shapefile (GEE accepted format)
+## couldn't convert it to asset, working on it (Error: Primary geometry of feature '306862' has 2454627 vertices, above the limit of 1000000 vertices. (Error code: 3)
+def nbr_bfs_caat_f20_prep():
+    bfs_fcaat20 = ee.FeatureCollection("projects/ee-whisp/assets/NBR/bfs_caat_2020")
+    bfs_fcaat20_binary = ee.Image().paint(bfs_fcaat20, 1)
+    return bfs_fcaat20_binary.rename("nBR_BFS_primary_forest_Caatinga_2020")
+
+
+# Atlantic Forest - filtered with QGIS because the original geodatabase is too large to export as a shapefile (GEE accepted format)
+def nbr_bfs_atlf_f20_prep():
+    bfs_fatlf20 = ee.FeatureCollection("projects/ee-whisp/assets/NBR/bfs_atlf_2020")
+    bfs_fatlf20_binary = ee.Image().paint(bfs_fatlf20, 1)
+    return bfs_fatlf20_binary.rename("nBR_BFS_primary_forest_AtlanticForest_2020")
+
+
+# Pampa - filtered in QGIS to save some storage space
+def nbr_bfs_pmp_f20_prep():
+    bfs_fpmp20 = ee.FeatureCollection("projects/ee-whisp/assets/NBR/bfs_pmp_2020")
+    bfs_fpmp20_binary = ee.Image().paint(bfs_fpmp20, 1)
+    return bfs_fpmp20_binary.rename("nBR_BFS_primary_forest_Pampa_2020")
+
+
+##########################secondary forests###############################################
+def nbr_terraclass_amz20_secondary_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_f = tcamz20.eq(2)
+    return tcamz20_f.rename("nBR_INPE_TC_secondary_forest_Amazon_2020")
+
+
+# Cerrado - filtered with QGIS because the original geodatabase is too large to export as a shapefile (GEE accepted format)
+def nbr_bfs_cer_f20_prep():
+    bfs_fcer20 = ee.FeatureCollection("projects/ee-whisp/assets/NBR/bfs_pmp_2020")
+    bfs_fcer20_binary = ee.Image().paint(bfs_fcer20, 1)
+    return bfs_fcer20_binary.rename("nBR_BFS_primary&secondary_forest_Cerrado_2020")
+
+
+# %%
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: classification_2020 = Forest formation (DN=3), Savanna Formation (DN=4, forest according to BR definition), Mangrove (DN=5), Floodable Forest (DN=6), Wooded Sandbank veg (DN=49)
+# the resulting dataset shows forest cover in 2020, without distinguishing between primary and secondary forests
+def nbr_mapbiomasc9_f20_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_forest = (
+        mapbiomasc9_20.eq(3)
+        .Or(mapbiomasc9_20.eq(4))
+        .Or(mapbiomasc9_20.eq(5))
+        .Or(mapbiomasc9_20.eq(6))
+        .Or(mapbiomasc9_20.eq(49))
+    )
+    return mapbiomasc9_20_forest.rename("nBR_MapBiomas_col9_forest_Brazil_2020")
+
+
+# ### ########################NBR plantation forest in 2020:#######################################
+
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Amazon biome, 2020
+# Subsetting criteria: silviculture (DN=9)
+# the resulting dataset shows monospecific commercial plantations, mostly eucalyptus and pinus.
+def nbr_terraclass_amz20_silv_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_silviculture = tcamz20.eq(9)
+    return tcamz20_silviculture.rename("nBR_INPE_TCsilviculture_Amazon_2020")
+
+
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Cerrado biome, 2020
+# Subsetting criteria: silviculture (DN=9)
+# the resulting dataset shows monospecific commercial plantations, mostly eucalyptus and pinus.
+def nbr_terraclass_silv_cer20_prep():
+    tccer20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_cer_2020")
+    tccer20_silviculture = tccer20.eq(9)
+    return tccer20_silviculture.rename("nBR_INPE_TCsilviculture_Cerrado_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = Forest plantation (DN=9)
+# the resulting dataset shows forest plantation in 2020
+def nbr_mapbiomasc9_silv20_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_silviculture = mapbiomasc9_20.eq(9)
+    return mapbiomasc9_20_silviculture.rename(
+        "nBR_MapBiomas_col9_silviculture_Brazil_2020"
+    )
+
+
+################ ### NBR Disturbances before 2020:########################################
+
+# [Official NFMS dataset] INPE PRODES data up to 2023
+# Subsetting criteria: DN = [0, 2, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60];
+
+# the resulting dataset shows deforestation and conversion of OWL and OL up to 2020 (mostly August 2020), including residues (omission errors corrections)
+def nbr_prodes_before_2020_prep():
+    prodes = ee.Image("projects/ee-whisp/assets/NBR/prodes_brasil_2023")
+    prodes_before_20_dn = [
+        0,
+        2,
+        4,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        17,
+        18,
+        19,
+        20,
+        50,
+        51,
+        52,
+        53,
+        54,
+        55,
+        56,
+        57,
+        58,
+        59,
+        60,
+    ]
+    prodes_before_20_mask = prodes.remap(
+        prodes_before_20_dn, [1] * len(prodes_before_20_dn)
+    )  # .eq(1)
+    prodes_before_20 = prodes_before_20_mask.selfMask()
+    return prodes_before_20.rename("nBR_PRODES_deforestation_Brazil_before_2020")
+
+
+## Caution: 1) includes deforestation and conversion of other wooded land and grassland
+
+# [Official NFMS dataset] INPE.DETER data from 2nd August 2016 up to the 04th of April 2025
+# Subsetting criteria: forest degradation classes ['CICATRIZ_DE_QUEIMADA', 'CS_DESORDENADO', 'DEGRADACAO'] and view_date until 2020-12-31
+# 'CS_GEOMETRICO' excluded to align with FREL
+
+
+def nbr_deter_amazon_before_2020_prep():
+    deteramz = ee.FeatureCollection("projects/ee-whisp/assets/NBR/deter_amz_16apr2025")
+    degradation_classes = ["CICATRIZ_DE_QUEIMADA", "CS_DESORDENADO", "DEGRADACAO"]
+
+    # Add a formatted date field based on VIEW_DATE
+    def add_formatted_date(feature):
+        return feature.set("formatted_date", ee.Date(feature.get("VIEW_DATE")))
+
+    deteramz = deteramz.map(add_formatted_date)
+
+    deter_deg = deteramz.filter(
+        ee.Filter.inList("CLASSNAME", degradation_classes)
+    ).filter(ee.Filter.lt("formatted_date", ee.Date("2020-12-31")))
+
+    deter_deg_binary = ee.Image().paint(deter_deg, 1)
+    return deter_deg_binary.rename("nBR_DETER_forestdegradation_Amazon_before_2020")
+
+
+################ ### NBR Disturbances after 2020:########################################
+# [Official NFMS dataset] INPE PRODES data up to 2023
+# Subsetting criteria: DN = [21, 22, 23, 61, 62, 63];
+
+# the resulting dataset shows deforestation and conversion of OWL and OL up to 2020 (mostly August 2020), including residues (omission errors corrections)
+
+
+def nbr_prodes_after_2020_prep():
+    prodes = ee.Image("projects/ee-whisp/assets/NBR/prodes_brasil_2023")
+    prodes_after_20_dn = [21, 22, 23, 61, 62, 63]
+    prodes_after_20_mask = prodes.remap(
+        prodes_after_20_dn, [1] * len(prodes_after_20_dn)
+    )  # .eq(1)
+    prodes_after_20 = prodes_after_20_mask.selfMask()
+    return prodes_after_20.rename("nBR_PRODES_deforestation_Brazil_after_2020")
+
+
+# %%
+# [Official NFMS dataset] INPE.DETER data from 2nd August 2016 up to the 04th of April 2025
+# Subsetting criteria: forest degradation classes ['CICATRIZ_DE_QUEIMADA', 'CS_DESORDENADO', 'DEGRADACAO'] and view_date from 2021-01-01 onward
+# 'CS_GEOMETRICO' excluded to align with FREL
+def nbr_deter_amazon_after_2020_prep():
+    deteramz = ee.FeatureCollection("projects/ee-whisp/assets/NBR/deter_amz_16apr2025")
+    degradation_classes = ["CICATRIZ_DE_QUEIMADA", "CS_DESORDENADO", "DEGRADACAO"]
+
+    # Add a formatted date field based on VIEW_DATE
+    def add_formatted_date(feature):
+        return feature.set("formatted_date", ee.Date(feature.get("VIEW_DATE")))
+
+    deteramz = deteramz.map(add_formatted_date)
+
+    deter_deg = deteramz.filter(
+        ee.Filter.inList("CLASSNAME", degradation_classes)
+    ).filter(ee.Filter.gt("formatted_date", ee.Date("2021-01-01")))
+
+    deter_deg_binary = ee.Image().paint(deter_deg, 1)
+    return deter_deg_binary.rename("nBR_DETER_forestdegradation_Amazon_after_2020")
+
+
+# ########################## NBR commodities - permanent/perennial crops in 2020:###############################
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Amazon biome, 2020
+# OR [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Cerrado biome, 2020
+# Subsetting criteria: perennial (DN=12) and semi-perennial (DN=13) crops
+# the resulting dataset shows perennial and semi-perennial crops in 2020
+def nbr_terraclass_amz_cer20_pc_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_pc = tcamz20.eq(12).Or(tcamz20.eq(13))
+    tccer20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_cer_2020")
+    tccer20_pc = tccer20.eq(12).Or(tccer20.eq(13))
+    tc_pc = ee.ImageCollection([tcamz20_pc, tccer20_pc]).mosaic()
+    return tc_pc.rename("nBR_INPE_TCamz_cer_perennial_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = coffee (DN=46) <================== COFFEE
+# the resulting dataset shows coffee area in 2020
+def nbr_mapbiomasc9_cof_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_coffee = mapbiomasc9_20.eq(46)
+    return mapbiomasc9_20_coffee.rename("nBR_MapBiomas_col9_coffee_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = palm oil (DN=35) <================= PALM OIL
+# the resulting dataset shows palm oil area in 2020
+def nbr_mapbiomasc9_po_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_palm = mapbiomasc9_20.eq(35)
+    return mapbiomasc9_20_palm.rename("nBR_MapBiomas_col9_palmoil_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = other perennial crops (DN=48)
+# the resulting dataset shows citrus and perennial crops other than coffee and palm oil in 2020
+def nbr_mapbiomasc9_pc_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_pc = mapbiomasc9_20.eq(35).Or(mapbiomasc9_20.eq(46))
+    return mapbiomasc9_20_pc.rename("nBR_MapBiomas_col9_pc_2020")
+
+
+# ######################## NBR commodities - annual crops in 2020:##############################
+
+# %%
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Amazon biome, 2020
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Cerrado biome, 2020
+# Subsetting criteria: annual/temporary 1 cycle (DN=14) or more than 1 cycle (DN=15)
+# the resulting dataset shows temporary crop in 2020
+def nbr_terraclass_amz_cer20_ac_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_ac = tcamz20.eq(14).Or(tcamz20.eq(15))
+    tccer20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_cer_2020")
+    tccer20_ac = tccer20.eq(14).Or(tccer20.eq(15))
+    tc_ac = ee.ImageCollection([tcamz20_ac, tccer20_ac]).mosaic()
+    return tc_ac.rename("nBR_INPE_TCamz_cer_annual_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = soybean (DN=39) <================== SOY
+# the resulting dataset shows soybean plantation area in 2020
+def nbr_mapbiomasc9_soy_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_soy = mapbiomasc9_20.eq(39)
+    return mapbiomasc9_20_soy.rename("nBR_MapBiomas_col9_soy_2020")
+
+
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = other temporary crops (DN=41)
+# Subsetting criteria: 'classification_2020' = sugar cane (DN=20)
+# Subsetting criteria: 'classification_2020' = rice (DN=40)
+# Subsetting criteria: 'classification_2020' = cotton (beta version, DN=62)
+# the resulting dataset shows temporary crop area other than soy, includes sugar cane, rice, and cotton
+def nbr_mapbiomasc9_ac_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_ac = (
+        mapbiomasc9_20.eq(41)
+        .Or(mapbiomasc9_20.eq(20))
+        .Or(mapbiomasc9_20.eq(40))
+        .Or(mapbiomasc9_20.eq(62))
+    )
+    return mapbiomasc9_20_ac.rename("nBR_MapBiomas_col9_annual_crops_2020")
+
+
+# ################################### NBR commodities - pasture/livestock in 2020:##############################
+
+# %%
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Amazon biome, 2020
+# Subsetting criteria: BUSH/SHRUB PASTURE (DN=10) or HERBACEOUS PASTURE (DN=11)
+
+# the resulting dataset shows 2020 pasture area in the Amazon
+def nbr_terraclass_amz20_pasture_prep():
+    tcamz20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_amz_2020")
+    tcamz20_pasture = tcamz20.eq(10).Or(tcamz20.eq(11))
+    return tcamz20_pasture.rename("nBR_INPE_TCamz_pasture_2020")
+
+
+# %%
+# [Official NFMS dataset] INPE/EMBRAPA TerraClass land use/cover in the Cerrado biome, 2020
+# Subsetting criteria: PASTURE (DN=11)
+# the resulting dataset shows 2020 pasture area in the Cerrado
+
+
+def nbr_terraclass_cer20_ac_prep():
+    tccer20 = ee.Image("projects/ee-whisp/assets/NBR/terraclass_cer_2020")
+    tccer20_pasture = tccer20.eq(11)
+    return tccer20_pasture.rename("nBR_INPE_TCcer_pasture_2020")
+
+
+# %%
+# [non-official dataset by MapBiomas multisector initiative]
+# land use/cover from 1985 up to 2023, collection 9
+# Subsetting criteria: 'classification_2020' = pasture (DN=15)
+# the resulting dataset shows pasture area in 2020 in Brazil
+def nbr_mapbiomasc9_pasture_prep():
+    mapbiomasc9_20 = ee.Image(
+        "projects/mapbiomas-public/assets/brazil/lulc/collection9/mapbiomas_collection90_integration_v1"
+    ).select("classification_2020")
+    mapbiomasc9_20_pasture = mapbiomasc9_20.eq(15)
+    return mapbiomasc9_20_pasture.rename("nBR_MapBiomas_col9_pasture_2020")
+
+
+###################################################################
+# nCO - Colombia
+
+
+def nco_ideam_forest_2020_prep():
+    ideam_forest_raw = ee.Image("projects/ee-whisp/assets/nCO/ideam_2020_geo")
+    ideam_forest = ideam_forest_raw.eq(1)  # get forest class
+    return ideam_forest.rename("nCO_ideam_forest_2020")
+
+
+def nco_ideam_agroforest_2020_prep():
+    ideam_agroforest_raw = ee.Image("projects/ee-whisp/assets/nCO/ideam_2020_geo_EUFO")
+    ideam_agroforest = ideam_agroforest_raw.eq(4)  # get forest class
+    return ideam_agroforest.rename("nCO_ideam_agroforest_2020")
+
+
+# Cocoa_bnetd
+def nci_ocs2020_prep():
+    return (
+        ee.Image("BNETD/land_cover/v1/2020")
+        .select("classification")
+        .eq(9)
+        .rename("nCI_Cocoa_bnetd")
+    )  # cocoa from national land cover map for Côte d'Ivoire
+
+
+###Combining datasets
+
+###Combining datasets
+
+# def combine_datasets():
+#     """Combines datasets into a single multiband image, with fallback if assets are missing."""
+#     img_combined = ee.Image(1).rename(geometry_area_column)
+
+#     # Combine images directly
+#     for img in [func() for func in list_functions()]:
+#         try:
+#             img_combined = img_combined.addBands(img)
+#         except ee.EEException as e:
+#             # logger.error(f"Error adding image: {e}")
+#             print(f"Error adding image: {e}")
+
+#     try:
+#         # Attempt to print band names to check for errors
+#         print(img_combined.bandNames().getInfo())
+#     except ee.EEException as e:
+#         # logger.error(f"Error printing band names: {e}")
+#         # logger.info("Running code for filtering to only valid datasets due to error in input")
+#         print("using valid datasets filter due to error in input")
+#         # Validate images
+#         images_to_test = [func() for func in list_functions()]
+#         valid_imgs = keep_valid_images(images_to_test)  # Validate images
+
+#         # Retry combining images after validation
+#         img_combined = ee.Image(1).rename(geometry_area_column)
+#         for img in valid_imgs:
+#             img_combined = img_combined.addBands(img)
+
+#     img_combined = img_combined.multiply(ee.Image.pixelArea())
+
+#     return img_combined
+
+
+def combine_datasets(national_codes=None):
     """Combines datasets into a single multiband image, with fallback if assets are missing."""
     img_combined = ee.Image(1).rename(geometry_area_column)
 
     # Combine images directly
-    for img in [func() for func in list_functions()]:
+    for img in [func() for func in list_functions(national_codes=national_codes)]:
         try:
             img_combined = img_combined.addBands(img)
         except ee.EEException as e:
@@ -759,7 +1283,9 @@ def combine_datasets():
         # logger.info("Running code for filtering to only valid datasets due to error in input")
         print("using valid datasets filter due to error in input")
         # Validate images
-        images_to_test = [func() for func in list_functions()]
+        images_to_test = [
+            func() for func in list_functions(national_codes=national_codes)
+        ]
         valid_imgs = keep_valid_images(images_to_test)  # Validate images
 
         # Retry combining images after validation
@@ -773,20 +1299,61 @@ def combine_datasets():
 
 
 ######helper functions to check images
-
-
 # list all functions ending with "_prep" (in the current script)
-def list_functions():
+# def list_functions():
+#     # Use the module's globals to get all defined functions
+#     current_module = inspect.getmodule(inspect.currentframe())
+#     functions = [
+#         func
+#         for name, func in inspect.getmembers(current_module, inspect.isfunction)
+#         if name.endswith("_prep")
+#     ]
+#     return functions
+
+
+def list_functions(national_codes=None):
+    """
+    Returns a list of functions that end with "_prep" and either:
+    - Start with "g_" (global/regional products)
+    - Start with any provided national code prefix (nXX_)
+
+    Args:
+        national_codes: List of ISO2 country codes (without the 'n' prefix)
+    """
     # Use the module's globals to get all defined functions
     current_module = inspect.getmodule(inspect.currentframe())
+
+    # If national_codes is None, default to an empty list
+    if national_codes is None:
+        national_codes = []
+
+    # Create prefixes list with proper formatting ('n' + code + '_')
+    allowed_prefixes = ["g_"] + [f"n{code.lower()}_" for code in national_codes]
+
+    # Filter functions in a single pass
     functions = [
         func
         for name, func in inspect.getmembers(current_module, inspect.isfunction)
         if name.endswith("_prep")
+        and any(name.startswith(prefix) for prefix in allowed_prefixes)
     ]
+
     return functions
 
 
+# # IN PROGRESS - expected behaviour
+# def filter_by_prefix_list(input_list=None,prefix_list=None):
+
+#     if input_list is None:
+#         print ("No function in list")
+#     if prefix_list is None:
+#         print ("No prefixes listed by which to filter")
+#     if input_list is not None:
+#         for prefix in prefix_list:
+#             if element.startsWith(prefix):
+#                 list.
+
+
 def keep_valid_images(images):
     """Keeps only valid images."""
     valid_images = []