dea-tools 0.2.8.dev108__tar.gz → 0.2.8.dev110__tar.gz

{dea-tools-0.2.8.dev108/dea_tools.egg-info → dea-tools-0.2.8.dev110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.2.8.dev108
+Version: 0.2.8.dev110
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia

{dea-tools-0.2.8.dev108 → dea-tools-0.2.8.dev110}/dea_tools/bandindices.py

@@ -15,7 +15,7 @@ here: https://gis.stackexchange.com/questions/tagged/open-data-cube).
 If you would like to report an issue with this script, you can file one
 on Github (https://github.com/GeoscienceAustralia/dea-notebooks/issues/new).
 
-Last modified: March 2021
+Last modified: June 2023
 '''
 
 # Import required packages
@@ -39,7 +39,7 @@ def calculate_indices(ds,
     in memory. This can be a memory-expensive operation, so to avoid
     this, set `inplace=True`.
 
-    Last modified: April 2023
+    Last modified: June 2023
     
     Parameters
     ----------
@@ -76,6 +76,7 @@ def calculate_indices(ds,
         * ``'NDSI'`` (Normalised Difference Snow Index, Hall 1995)
         * ``'NDTI'`` (Normalise Difference Tillage Index,
                 Van Deventeret et al. 1997)
+        * ``'NDTI2'`` (Normalised Difference Turbidity Index, Lacaux et al., 2007)
         * ``'NDVI'`` (Normalised Difference Vegetation Index, Rouse 1973)
         * ``'NDWI'`` (Normalised Difference Water Index, McFeeters 1996)
         * ``'SAVI'`` (Soil Adjusted Vegetation Index, Huete 1988)
@@ -85,7 +86,6 @@ def calculate_indices(ds,
         * ``'TCB_GSO'`` (Tasseled Cap Brightness, Nedkov 2017)
         * ``'TCG_GSO'`` (Tasseled Cap Greeness, Nedkov 2017)
         * ``'TCW_GSO'`` (Tasseled Cap Wetness, Nedkov 2017)
-        * ``'TI'`` (Normalised Difference Turbidity Index, Lacaux et al 2007)
         * ``'WI'`` (Water Index, Fisher 2016)
         * ``'kNDVI'`` (Non-linear Normalised Difference Vegation Index,
                  Camps-Valls et al. 2021)
@@ -201,6 +201,11 @@ def calculate_indices(ds,
                   # Van Deventer et al. 1997
                   'NDTI': lambda ds: (ds.swir1 - ds.swir2) /
                                      (ds.swir1 + ds.swir2),
+        
+                  # Normalised Difference Turbidity Index,
+                  # Lacaux et al., 2007
+                  'NDTI2': lambda ds: (ds.red - ds.green) /
+                                     (ds.red + ds.green),
 
                   # Normalised Difference Water Index, McFeeters 1996
                   'NDWI': lambda ds: (ds.green - ds.nir) /
@@ -287,11 +292,7 @@ def calculate_indices(ds,
 
                   # Iron Oxide Ratio, Segal 1982
                   'IOR': lambda ds: (ds.red / ds.blue),
-      
-                  # Normalised Difference Turbidity Index , Lacaux et al 2007
-                  #NB. 'NDTI' key already used. 'TI' used in lieu.
-                  'TI': lambda ds:  (ds.red - ds.green) /
-                                    (ds.red + ds.green)
+
     }
     
     # If index supplied is not a list, convert to list. This allows us to

{dea-tools-0.2.8.dev108 → dea-tools-0.2.8.dev110}/dea_tools/datahandling.py

@@ -236,7 +236,7 @@ def load_ard(
         dictionary (e.g. `**query`). Keywords can include `measurements`,
         `x`, `y`, `time`, `resolution`, `resampling`, `group_by`, `crs`;
         see the `dc.load` documentation for all possible options:
-        https://datacube-core.readthedocs.io/en/latest/api/indexed-data/generate/datacube.Datacube.load.html
+        https://datacube-core.readthedocs.io/en/latest/dev/api/generate/datacube.Datacube.load.html
 
     Returns
     -------
@@ -244,13 +244,6 @@ def load_ard(
         An xarray.Dataset containing only satellite observations with
         a proportion of good quality pixels greater than `min_gooddata`.
 
-    Notes
-    -----
-    The `load_ard` function builds on the Open Data Cube's native `dc.load`
-    function by adding the ability to load multiple satellite data
-    products at once, and automatically apply cloud masking and filtering.
-    For loading non-satellite data products (e.g. DEA Water Observations),
-    use `dc.load` instead.
     """
 
     #########

{dea-tools-0.2.8.dev108 → dea-tools-0.2.8.dev110}/dea_tools/plotting.py

@@ -51,6 +51,7 @@ def rgb(ds,
         col_wrap=4,
         size=6,
         aspect=None,
+        titles=None,
         savefig_path=None,
         savefig_kwargs={},
         **kwargs):
@@ -107,6 +108,10 @@ def rgb(ds,
         gives width of each facet in inches. Defaults to None, which 
         will calculate the aspect based on the x and y dimensions of 
         the input data.
+    titles : string or list of strings, optional
+        Replace the xarray 'time' dimension on plot titles with a string
+        or list of string titles, when a list of index values are
+        provided, of your choice. Defaults to None.
     savefig_path : string, optional
         Path to export image file for the RGB plot. Defaults to None, 
         which does not export an image file.
@@ -182,6 +187,9 @@ def rgb(ds,
                              col_wrap=col_wrap,
                              **aspect_size_kwarg,
                              **kwargs)
+        if titles is not None:
+            for ax, title in zip(img.axs.flat, titles):
+                ax.set_title(title)
 
     # If values provided for `index`, extract corresponding observations and
     # plot as either single image or facet plot
@@ -221,6 +229,9 @@ def rgb(ds,
                                  col_wrap=col_wrap,
                                  **aspect_size_kwarg,
                                  **kwargs)
+            if titles is not None:
+                for ax, title in zip(img.axs.flat, titles):
+                    ax.set_title(title)
 
         # If only one index is supplied, squeeze out index_dim and plot as a
         # single panel
@@ -229,6 +240,9 @@ def rgb(ds,
             img = da.squeeze(dim=index_dim).plot.imshow(robust=robust,
                                                         **aspect_size_kwarg,
                                                         **kwargs)
+            if titles is not None:
+                for ax, title in zip(img.axs.flat, titles):
+                    ax.set_title(title)
 
     # If an export path is provided, save image to file. Individual and
     # faceted plots have a different API (figure vs fig) so we get around this

{dea-tools-0.2.8.dev108 → dea-tools-0.2.8.dev110/dea_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.2.8.dev108
+Version: 0.2.8.dev110
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia