dea-tools 0.3.4.dev47__tar.gz → 0.3.4.dev49__tar.gz

{dea_tools-0.3.4.dev47/dea_tools.egg-info → dea_tools-0.3.4.dev49}/PKG-INFO

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

{dea_tools-0.3.4.dev47 → dea_tools-0.3.4.dev49}/dea_tools/coastal.py

@@ -16,7 +16,7 @@ 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: June 2024
+Last modified: July 2024
 
 """
 
@@ -250,7 +250,6 @@ def _model_tides(
     `pyTMD`.
     """
 
-    import pyTMD.constants
     import pyTMD.eop
     import pyTMD.io
     import pyTMD.time
@@ -280,7 +279,7 @@ def _model_tides(
     timescale = pyTMD.time.timescale().from_datetime(time.flatten())
 
     # Read tidal constants and interpolate to grid points
-    if pytmd_model.format in ("OTIS", "ATLAS", "ESR"):
+    if pytmd_model.format in ("OTIS", "ATLAS", "TMD3"):
         amp, ph, D, c = pyTMD.io.OTIS.extract_constants(
             lon,
             lat,
@@ -614,6 +613,10 @@ def model_tides(
         - {directory}/fes2014/ocean_tide/
         - {directory}/fes2014/load_tide/
 
+    For FES2022 (https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html):
+        - {directory}/fes2022b/ocean_tide/
+        - {directory}/fes2022b/load_tide/
+
     For TPXO8-atlas (https://www.tpxo.net/tpxo-products-and-registration):
         - {directory}/tpxo8_atlas/
 
@@ -648,6 +651,7 @@ def model_tides(
     model : string, optional
         The tide model used to model tides. Options include:
         - "FES2014" (pre-configured on DEA Sandbox)
+        - "FES2022"
         - "TPXO9-atlas-v5"
         - "TPXO8-atlas"
         - "EOT20"
@@ -719,7 +723,7 @@ def model_tides(
         Defaults to "long".
     ensemble_models : list, optional
         An optional list of models used to generate the ensemble tide
-        model if "ensemble" tide modelling is requested. Defaults to 
+        model if "ensemble" tide modelling is requested. Defaults to
         ["FES2014", "TPXO9-atlas-v5", "EOT20", "HAMTIDE11", "GOT4.10",
         "FES2012", "TPXO8-atlas-v1"].
     **ensemble_kwargs :
@@ -781,6 +785,7 @@ def model_tides(
 
     # Verify that all provided models are supported
     valid_models = [
+        "FES2022",
         "FES2014",
         "TPXO9-atlas-v5",
         "EOT20",
@@ -1072,6 +1077,7 @@ def pixel_tides(
         The tide model or a list of models used to model tides, as
         supported by the `pyTMD` Python package. Options include:
         - "FES2014" (default; pre-configured on DEA Sandbox)
+        - "FES2022"
         - "TPXO8-atlas"
         - "TPXO9-atlas-v5"
         - "EOT20"

{dea_tools-0.3.4.dev47 → dea_tools-0.3.4.dev49}/dea_tools/wetlands.py

@@ -18,7 +18,7 @@ here: https://gis.stackexchange.com/questions/tagged/open-data-cube).
 If you would like to report an issue with this script, file one on 
 GitHub: https://github.com/GeoscienceAustralia/dea-notebooks/issues/new
 
-Last modified: July 2023
+Last modified: July 2024
 """
 
 import seaborn as sns
@@ -155,7 +155,7 @@ def normalise_wit(polygon_base_df):
 
     # convert the string to Python datetime format, easy to do display the result in PNG
     polygon_base_df.loc[:, "date"] = pd.to_datetime(
-        polygon_base_df["date"], infer_datetime_format=True
+        polygon_base_df["date"]
     )
 
     polygon_base_df.reset_index(inplace=True)
@@ -216,6 +216,7 @@ def display_wit_stack_with_df(
     png_name="your_file_name",
     width=32,
     height=6,
+    x_axis_labels="years"
 ):
     """
     This functions produces WIT plots. Function displays a stack plot and saves as a png.
@@ -233,6 +234,9 @@ def display_wit_stack_with_df(
      'norm_npv']
      polygon_name : string
      png_name : string
+     x_axis_labels : string with options of "years" or "months" 
+     to set either years or months on the x axis as labels
+     
 
     """
 
@@ -297,10 +301,19 @@ def display_wit_stack_with_df(
         hatch="//",
     )
 
-    # modify the xaxis settings
-    ax.xaxis.set_major_locator(mdates.YearLocator())
-    ax.xaxis.set_major_formatter(mdates.DateFormatter("%Y"))
-
+    if x_axis_labels=="years":
+        # modify the xaxis settings
+        ax.xaxis.set_major_locator(mdates.YearLocator())
+        ax.xaxis.set_major_formatter(mdates.DateFormatter("%Y"))
+        
+    if x_axis_labels=="months":
+       # modify the xaxis settings
+        ax.xaxis.set_major_locator(mdates.MonthLocator())
+        ax.xaxis.set_major_formatter(mdates.DateFormatter('%b-%Y'))
+        # Rotates and right-aligns the x labels so they don't crowd each other.
+        for label in ax.get_xticklabels(which='major'):
+            label.set(rotation=30, horizontalalignment='right')
+        
     x_label_text = "The Fractional Cover algorithm developed by the Joint Remote Sensing Research Program and\n the Water Observations from Space algorithm developed by Geoscience Australia are used in the production of this data"
 
     ax.set_xlabel(x_label_text, style="italic")

{dea_tools-0.3.4.dev47 → dea_tools-0.3.4.dev49/dea_tools.egg-info}/PKG-INFO

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