version 1.2.2

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+forestatrisk 1.2.2
+++++++++++++++++++
+
+* Replacing ``gdal.TermProgress`` with ``gdal.TermProgress_nocb``.
+* Changes: https://github.com/ghislainv/forestatrisk/compare/v1.2.1...v1.2.2
+
 forestatrisk 1.2.1
 ++++++++++++++++++
 

forestatrisk/__init__.py

@@ -10,7 +10,7 @@
 # https://peps.python.org/pep-0008/#module-level-dunder-names
 __author__ = "Ghislain Vieilledent"
 __email__ = "[email protected]"
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 # GDAL exceptions
 from osgeo import gdal

forestatrisk/data/compute/compute_biomass_avitabile.py

@@ -29,7 +29,7 @@ def compute_biomass_avitabile(proj, extent, verbose=False):
     """
 
     # Callback
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
 
     # Creation options
     copts = ["COMPRESS=DEFLATE", "PREDICTOR=2", "BIGTIFF=YES"]

forestatrisk/data/compute/compute_distance.py

@@ -61,7 +61,7 @@ def compute_distance(input_file, dist_file, values=0,
     # Compute distance
     val = "VALUES=" + str(values)
     use_input_nodata = "USE_INPUT_NODATA=" + ui_nodata
-    cb = gdal.TermProgress if verbose else 0
+    cb = gdal.TermProgress_nocb if verbose else 0
     gdal.ComputeProximity(
         srcband,
         dstband,

forestatrisk/data/compute/compute_forest.py

@@ -1,6 +1,7 @@
 """Processing forest data."""
 
 import subprocess
+from glob import glob
 
 from osgeo import gdal
 
@@ -22,11 +23,21 @@ def compute_forest(proj, extent, verbose=False):
     """
 
     # Callback
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
 
     # Creation options
     copts = ["COMPRESS=DEFLATE", "PREDICTOR=2", "BIGTIFF=YES"]
 
+    # Make vrt
+    tif_forest_files = glob("forest_tiles/forest_*.tif")
+    forest_vrt = gdal.BuildVRT(
+        "forest.vrt",
+        tif_forest_files,
+        callback=cback)
+    # Flush cache
+    forest_vrt.FlushCache()
+    forest_vrt = None
+
     # Reproject
     param = gdal.WarpOptions(
         warpOptions=["overwrite"],

forestatrisk/data/compute/compute_gadm.py

@@ -31,7 +31,7 @@ def compute_gadm(ifile, ofile, proj, verbose=False):
 
     aoi_latlon_file = opj(opd(ofile), "aoi_latlon.gpkg")
 
-    cb = gdal.TermProgress if verbose else 0
+    cb = gdal.TermProgress_nocb if verbose else 0
 
     # Change layer and file names
     if not os.path.isfile(aoi_latlon_file):

forestatrisk/data/compute/compute_osm.py

@@ -65,7 +65,7 @@ def compute_osm(proj, extent, verbose=False):
         print(rtn.stdout)
 
     # Callback
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
 
     # Creation options
     copts = ["COMPRESS=DEFLATE", "PREDICTOR=2", "BIGTIFF=YES"]

forestatrisk/data/compute/compute_srtm.py

@@ -21,7 +21,7 @@ def compute_srtm(proj, extent, verbose=False):
     """
 
     # Callback
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
 
     # Creation options
     copts = ["COMPRESS=DEFLATE", "PREDICTOR=2", "BIGTIFF=YES"]

forestatrisk/data/compute/compute_wdpa.py

@@ -24,7 +24,7 @@ def compute_wdpa(iso, proj, extent, where=None, verbose=False):
     """
 
     # Callback
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
 
     # Defaut value for where
     if where is None:

forestatrisk/predict/predict_raster.py

@@ -93,7 +93,7 @@ def predict_raster(
     )
     rand_uuid = uuid.uuid4()
     vrt_file = f"/vsimem/var_{rand_uuid}.vrt"
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
     gdal.BuildVRT(vrt_file, raster_list,
                   options=param, callback=cback)
     stack = gdal.Open(vrt_file)

forestatrisk/predict/predict_raster_binomial_iCAR.py

@@ -111,7 +111,7 @@ def predict_raster_binomial_iCAR(
     )
     rand_uuid = uuid.uuid4()
     vrt_file = f"/vsimem/var_{rand_uuid}.vrt"
-    cback = gdal.TermProgress if verbose else 0
+    cback = gdal.TermProgress_nocb if verbose else 0
     gdal.BuildVRT(vrt_file, raster_list,
                   options=param, callback=cback)
     stack = gdal.Open(vrt_file)