Allow use of geefcc in sequential and add resample=False to plot

ghislainv · May 31, 2024 · bad3b33 · bad3b33
1 parent 22c481f
commit bad3b33
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/forestatrisk/data/country_download.py b/forestatrisk/data/country_download.py
@@ -35,7 +35,8 @@ def country_download(
        ``get_fcc()`` from Python package ``geefcc``. For example:
        ``{"aoi": "MTQ", "buff": 0.08983152841195216 , "years": [2000,
        2010, 2020], "source": "tmf", "perc": 75, "tile_size": 1,
-       "ncpu": None, "output_file": "forest_MTQ.tiff"}``.
+       "parallel": True, "ncpu": None, "output_file":
+       "forest_MTQ.tiff"}``.
 
     :param iso3: Country iso code used to download GADM, OSM, SRTM,
         and WDPA data. The iso code should correspond to the country
@@ -80,6 +81,7 @@ def country_download(
             source=get_fcc_args.get("source", "tmf"),
             perc=get_fcc_args.get("perc", 75),
             tile_size=get_fcc_args.get("tile_size", 1),
+            parallel=get_fcc_args.get("parallel", True),
             ncpu=get_fcc_args.get("ncpu", None),
             output_file=get_fcc_args.get("output_file", "fcc.tif")
         )

diff --git a/forestatrisk/plot/niceplot.py b/forestatrisk/plot/niceplot.py
@@ -176,7 +176,8 @@ def nice_plot_prob(
     fig = plt.figure(figsize=figsize, dpi=dpi)
     plt.subplot(111, projection=projection)
     # Raster data
-    plt.imshow(ov_arr, cmap=color_map, extent=extent, vmin=0.01, vmax=65535)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent,
+               vmin=0.01, vmax=65535, resample=False)
     if borders is not None:
         _plot_layer(borders, symbol="k-", **kwargs)
 

diff --git a/forestatrisk/plot/plot.py b/forestatrisk/plot/plot.py
@@ -303,7 +303,7 @@ def fcc(
     ax1.set_frame_on(False)
     ax1.set_xticks([])
     ax1.set_yticks([])
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
     plt.axis("off")
@@ -313,7 +313,7 @@ def fcc(
         )
         ax1.add_patch(z)
         ax2 = plt.subplot(222)
-        plt.imshow(ov_arr, cmap=color_map, extent=extent)
+        plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
         plt.xlim(zoom[0], zoom[1])
         plt.ylim(zoom[2], zoom[3])
         ax2.set_xticks([])
@@ -421,7 +421,7 @@ def fcc12345(
     ax1.set_frame_on(False)
     ax1.set_xticks([])
     ax1.set_yticks([])
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
     plt.axis("off")
@@ -431,7 +431,7 @@ def fcc12345(
         )
         ax1.add_patch(z)
         ax2 = plt.subplot(222)
-        plt.imshow(ov_arr, cmap=color_map, extent=extent)
+        plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
         plt.xlim(zoom[0], zoom[1])
         plt.ylim(zoom[2], zoom[3])
         ax2.set_xticks([])
@@ -533,7 +533,7 @@ def fcc123(
     ax1.set_frame_on(False)
     ax1.set_xticks([])
     ax1.set_yticks([])
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
     plt.axis("off")
@@ -543,7 +543,7 @@ def fcc123(
         )
         ax1.add_patch(z)
         ax2 = plt.subplot(222)
-        plt.imshow(ov_arr, cmap=color_map, extent=extent)
+        plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
         plt.xlim(zoom[0], zoom[1])
         plt.ylim(zoom[2], zoom[3])
         ax2.set_xticks([])
@@ -645,7 +645,7 @@ def forest(
     ax1.set_frame_on(False)
     ax1.set_xticks([])
     ax1.set_yticks([])
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
     plt.axis("off")
@@ -655,7 +655,7 @@ def forest(
         )
         ax1.add_patch(z)
         ax2 = plt.subplot(222)
-        plt.imshow(ov_arr, cmap=color_map, extent=extent)
+        plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
         plt.xlim(zoom[0], zoom[1])
         plt.ylim(zoom[2], zoom[3])
         ax2.set_xticks([])
@@ -758,7 +758,8 @@ def prob(
     # Plot raster
     fig = plt.figure(figsize=figsize, dpi=dpi)
     plt.subplot(111)
-    plt.imshow(ov_arr, cmap=color_map, extent=extent, vmin=0.01, vmax=65535)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent,
+               vmin=0.01, vmax=65535, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
 
@@ -852,7 +853,7 @@ def obs(
     ax1.set_yticks([])
     plt.axis("off")
     # Raster
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     # Points
     f = name_forest_var
     x_defor = sample[sample[f] == 0]["X"]
@@ -950,7 +951,7 @@ def differences(
     ax1.set_frame_on(False)
     ax1.set_xticks([])
     ax1.set_yticks([])
-    plt.imshow(ov_arr, cmap=color_map, extent=extent)
+    plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
     if borders is not None:
         plot_layer(borders, symbol="k-", **kwargs)
     plt.axis("off")
@@ -960,7 +961,7 @@ def differences(
         )
         ax1.add_patch(z)
         ax2 = plt.subplot(222)
-        plt.imshow(ov_arr, cmap=color_map, extent=extent)
+        plt.imshow(ov_arr, cmap=color_map, extent=extent, resample=False)
         plt.xlim(zoom[0], zoom[1])
         plt.ylim(zoom[2], zoom[3])
         ax2.set_xticks([])