anta-database 0.4.0__tar.gz → 0.4.2__tar.gz

{anta_database-0.4.0 → anta_database-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anta_database
-Version: 0.4.0
+Version: 0.4.2
 Summary: SQLite database for the AntArchitecture Community Data
 Author: Antoine Hermant
 Author-email: antoine.hermant@etik.com

{anta_database-0.4.0 → anta_database-0.4.2}/anta_database/__init__.py

@@ -16,6 +16,7 @@ from .indexing.index_database import IndexDatabase
 
 # Plotting modules
 from .plotting.plotting import Plotting
+from .plotting.plotting_pism import PISMPlotting
 
 __all__ = [
     # Database classes
@@ -27,4 +28,5 @@ __all__ = [
     "IndexDatabase",
     # Plotting functions
     "Plotting",
+    "PISMPlotting",
 ]

{anta_database-0.4.0 → anta_database-0.4.2}/anta_database/database/database.py

@@ -8,6 +8,7 @@ from typing import Union, List, Dict, Tuple, Optional, Generator
 from tqdm import tqdm
 
 from anta_database.plotting.plotting import Plotting
+from anta_database.plotting.plotting_pism import PISMPlotting
 from anta_database.indexing.index_database import IndexDatabase
 
 
@@ -25,6 +26,7 @@ class Database:
         self._file_db_path = os.path.join(self._db_dir, file_db)
         self._md = None
         self._plotting = None
+        self._pism_plotting = None
         self._max_displayed_flight_ids = max_displayed_flight_ids
         self._include_BM = include_BEDMAP
         self._include_BM = index_database
@@ -981,6 +983,12 @@ class Database:
             self._plotting = Plotting(self)
         return self._plotting
 
+    @property
+    def plot_PISM(self):
+        if self._pism_plotting is None:
+            self._pism_plotting = PISMPlotting(self)
+        return self._pism_plotting
+
 
 class MetadataResult:
     def __init__(self, metadata, max_displayed_flight_ids):

{anta_database-0.4.0 → anta_database-0.4.2}/anta_database/plotting/__init__.py

@@ -5,5 +5,6 @@ Contains functions for data visualization and plotting.
 """
 
 from .plotting import Plotting
+from .plotting_pism import PISMPlotting
 
-__all__ = ["Plotting"]
+__all__ = ["Plotting", "PISMPlotting"]

{anta_database-0.4.0 → anta_database-0.4.2}/anta_database/plotting/plotting.py

@@ -241,7 +241,7 @@ class Plotting:
             mini_map=mini_map,
         )
 
-    def transect_1D(
+    def stratigraphy(
         self,
         metadata: Union[None, Dict, "MetadataResult"] = None,
         elevation: Optional[bool] = False,
@@ -263,7 +263,7 @@ class Plotting:
         Plot the color-coded values of the given variable on Antarcitic map
         """
         self._base_plot(
-            color_by="transect_1D",
+            color_by="stratigraphy",
             elevation=elevation,
             metadata=metadata,
             downsampling_factor=downsampling_factor,
@@ -334,12 +334,12 @@ class Plotting:
         # else: FIXME: this seems to crash spyder for spyder users
         #     matplotlib.use('TkAgg')
 
-        fig, ax = plt.subplots()
+        fig, ax = plt.subplots(constrained_layout=True)
 
         if basins:
             grounding_line = False
         # --- Plot Grounding Line ---
-        if True and color_by != "transect_1D":  # FIXME
+        if True and color_by != "stratigraphy":  # FIXME
             gl = pd.read_parquet(self._gl_path)
             ax.plot(gl.x / 1000, gl.y / 1000, linewidth=1, color="k")
 
@@ -365,6 +365,9 @@ class Plotting:
             xmin, xmax = xlim
             ymin, ymax = ylim
 
+        if color_by == "stratigraphy":
+            mini_map = False
+
         inset_pos = [0.7, 0.75, 0.25, 0.25]
         inset = fig.add_axes(
             inset_pos,  # [left, bottom, width, height] in figure coordinates
@@ -506,6 +509,7 @@ class Plotting:
                     color=colors[institute],
                     s=marker_size,
                     linewidths=0,
+                    zorder=10,
                 )
 
                 ax.plot([], [], color=colors[institute], label=institute, linewidth=3)
@@ -596,10 +600,9 @@ class Plotting:
                         subset["PSX"] / 1000,
                         subset["PSY"] / 1000,
                         color="darkgreen",
-                        s=marker_size,
-                        norm=norm,
+                        s=marker_size * 0.5,
                         linewidths=0,
-                        zorder=i,
+                        zorder=11,
                     )
 
             elif var in ["ICE_THK", "SURF_ELEV", "BED_ELEV", "BASAL_UNIT"]:
@@ -659,11 +662,9 @@ class Plotting:
                     df["PSX"] / 1000,
                     df["PSY"] / 1000,
                     color="darkgreen",
-                    s=marker_size,
-                    vmin=vmin,
-                    vmax=vmax,
+                    s=marker_size * 0.5,
                     linewidths=0,
-                    rasterized=True,
+                    zorder=11,
                 )
 
             elif var in ["IRH_DEPTH"]:
@@ -710,14 +711,12 @@ class Plotting:
                         df["PSX"] / 1000,
                         df["PSY"] / 1000,
                         color="darkgreen",
-                        s=marker_size,
-                        vmin=vmin,
-                        vmax=vmax,
+                        s=marker_size * 0.5,
                         linewidths=0,
-                        rasterized=True,
+                        zorder=11,
                     )
 
-        if color_by == "transect_1D":
+        if color_by == "stratigraphy":
             flight_id = list(metadata["flight_id"])
             if len(flight_id) > 1:
                 flight_id = flight_id[0]
@@ -808,14 +807,17 @@ class Plotting:
                 ax.plot([], [], color="grey", label="Surface Elevation", linewidth=3)
 
             else:
-                scatter = ax.scatter(
-                    ds.Distance / 1000,
-                    ds.ICE_THK,
-                    color="k",
-                    s=marker_size,
-                    linewidths=0.1,
-                )
-                ax.plot([], [], color="k", label="Bed Depth", linewidth=3)
+                if "ICE_THK" in ds.variables:
+                    scatter = ax.scatter(
+                        ds.Distance / 1000,
+                        ds.ICE_THK,
+                        color="k",
+                        s=marker_size,
+                        linewidths=0.1,
+                    )
+                    ax.plot([], [], color="k", label="Bed Depth", linewidth=3)
+                else:
+                    print("Cannot plot Bed Depth from the variables in the file")
 
             if elevation:
                 ylim = (
@@ -876,6 +878,7 @@ class Plotting:
                     color=colors[flight_id],
                     s=marker_size,
                     linewidths=0,
+                    zorder=10,
                 )
 
                 ax.plot([], [], color=colors[flight_id], label=flight_id, linewidth=3)
@@ -894,7 +897,11 @@ class Plotting:
         if not self._disable_tqdm:
             print("Formatting ...")
 
-        if auto_zoom:
+        if color_by == "stratigraphy":
+            xmin, xmax = xlim
+            ymin, ymax = ylim
+
+        elif auto_zoom:
             xmin = xmin - 10 if xmin is not None else None
             xmax = xmax + 10 if xmax is not None else None
             ymin = ymin - 10 if ymin is not None else None
@@ -902,7 +909,7 @@ class Plotting:
 
         ax.set_xlim(xmin, xmax)
         ax.set_ylim(ymin, ymax)
-        if color_by != "transect_1D":
+        if color_by != "stratigraphy":
             x0_ax, x1_ax = ax.get_xlim()
             y0_ax, y1_ax = ax.get_ylim()
             x0 = x0_ax if xlim[0] == None else xlim[0]
@@ -960,7 +967,7 @@ class Plotting:
             cbar.ax.xaxis.set_ticks_position("bottom")
             if label:
                 cbar.set_label(label)
-        elif color_by == "transect_1D":
+        elif color_by == "stratigraphy":
             ax.legend(ncols=2)
             ax.set_xlabel("Distance along transect [km]")
             if elevation:
@@ -969,10 +976,8 @@ class Plotting:
                 ax.set_ylabel("Depth below surface [m]")
             plt.gcf().set_size_inches(10 * scale_factor, 10 * 2 / 3)
 
-        plt.tight_layout()
-
         # --- Plot IMBIE basins ---
-        if basins and color_by != "transect_1D":
+        if basins and color_by != "stratigraphy":
             sf_basins = shapefile.Reader(self._imbie_path)
             basin_patches = []
 
@@ -1072,7 +1077,7 @@ class Plotting:
             inset.remove()
 
         # --- Plot ice core sites ---
-        if stations and color_by != "transect_1D":
+        if stations and color_by != "stratigraphy":
             site_coords = pd.read_parquet(self._site_coords_path)
             for i in site_coords.index:
                 site = site_coords.loc[i]