pastastore 1.10.2__py3-none-any.whl → 1.12.0__py3-none-any.whl

pastastore/datasets.py

@@ -1,6 +1,6 @@
 """Module containing example dataset."""
 
-import os
+from pathlib import Path
 
 import pandas as pd
 from hydropandas import Obs, ObsCollection
@@ -30,8 +30,8 @@ def example_pastastore(conn="DictConnector"):
         PastaStore containing example dataset
     """
     # check it test dataset is available
-    datadir = os.path.join(os.path.dirname(__file__), "../tests/data")
-    if not os.path.exists(datadir):
+    datadir = Path(__file__).parent / "../tests/data"
+    if not datadir.exists():
         raise FileNotFoundError(
             "Test datasets not available! Clone repository from GitHub."
         )
@@ -46,63 +46,57 @@ def example_pastastore(conn="DictConnector"):
     # add data
 
     # oseries 1
-    o = pd.read_csv(os.path.join(datadir, "obs.csv"), index_col=0, parse_dates=True)
+    o = pd.read_csv(datadir / "obs.csv", index_col=0, parse_dates=True)
     pstore.add_oseries(o, "oseries1", metadata={"x": 165000, "y": 424000})
     # oseries 2
-    o = pd.read_csv(
-        os.path.join(datadir, "head_nb1.csv"), index_col=0, parse_dates=True
-    )
+    o = pd.read_csv(datadir / "head_nb1.csv", index_col=0, parse_dates=True)
     pstore.add_oseries(o, "oseries2", metadata={"x": 164000, "y": 423000})
 
     # oseries 3
-    o = pd.read_csv(os.path.join(datadir, "gw_obs.csv"), index_col=0, parse_dates=True)
+    o = pd.read_csv(datadir / "gw_obs.csv", index_col=0, parse_dates=True)
     pstore.add_oseries(o, "oseries3", metadata={"x": 165554, "y": 422685})
 
     # prec 1
-    s = pd.read_csv(os.path.join(datadir, "rain.csv"), index_col=0, parse_dates=True)
+    s = pd.read_csv(datadir / "rain.csv", index_col=0, parse_dates=True)
     pstore.add_stress(s, "prec1", kind="prec", metadata={"x": 165050, "y": 424050})
 
     # prec 2
-    s = pd.read_csv(
-        os.path.join(datadir, "rain_nb1.csv"), index_col=0, parse_dates=True
-    )
+    s = pd.read_csv(datadir / "rain_nb1.csv", index_col=0, parse_dates=True)
     pstore.add_stress(s, "prec2", kind="prec", metadata={"x": 164010, "y": 423000})
 
     # evap 1
-    s = pd.read_csv(os.path.join(datadir, "evap.csv"), index_col=0, parse_dates=True)
+    s = pd.read_csv(datadir / "evap.csv", index_col=0, parse_dates=True)
     pstore.add_stress(s, "evap1", kind="evap", metadata={"x": 164500, "y": 424000})
 
     # evap 2
-    s = pd.read_csv(
-        os.path.join(datadir, "evap_nb1.csv"), index_col=0, parse_dates=True
-    )
+    s = pd.read_csv(datadir / "evap_nb1.csv", index_col=0, parse_dates=True)
     pstore.add_stress(s, "evap2", kind="evap", metadata={"x": 164000, "y": 423030})
 
     # well 1
-    s = pd.read_csv(os.path.join(datadir, "well.csv"), index_col=0, parse_dates=True)
+    s = pd.read_csv(datadir / "well.csv", index_col=0, parse_dates=True)
     s = timestep_weighted_resample(s, pd.date_range(s.index[0], s.index[-1], freq="D"))
     pstore.add_stress(s, "well1", kind="well", metadata={"x": 164691, "y": 423579})
 
     # river notebook data (nb5)
     oseries = pd.read_csv(
-        os.path.join(datadir, "nb5_head.csv"), parse_dates=True, index_col=0
+        datadir / "nb5_head.csv", parse_dates=True, index_col=0
     ).squeeze("columns")
     pstore.add_oseries(oseries, "head_nb5", metadata={"x": 200_000, "y": 450_000.0})
 
-    rain = pd.read_csv(
-        os.path.join(datadir, "nb5_prec.csv"), parse_dates=True, index_col=0
-    ).squeeze("columns")
+    rain = pd.read_csv(datadir / "nb5_prec.csv", parse_dates=True, index_col=0).squeeze(
+        "columns"
+    )
     pstore.add_stress(
         rain, "prec_nb5", kind="prec", metadata={"x": 200_000, "y": 450_000.0}
     )
-    evap = pd.read_csv(
-        os.path.join(datadir, "nb5_evap.csv"), parse_dates=True, index_col=0
-    ).squeeze("columns")
+    evap = pd.read_csv(datadir / "nb5_evap.csv", parse_dates=True, index_col=0).squeeze(
+        "columns"
+    )
     pstore.add_stress(
         evap, "evap_nb5", kind="evap", metadata={"x": 200_000, "y": 450_000.0}
     )
     waterlevel = pd.read_csv(
-        os.path.join(datadir, "nb5_riv.csv"), parse_dates=True, index_col=0
+        datadir / "nb5_riv.csv", parse_dates=True, index_col=0
     ).squeeze("columns")
     pstore.add_stress(
         waterlevel,
@@ -110,11 +104,7 @@ def example_pastastore(conn="DictConnector"):
         kind="riv",
         metadata={"x": 200_000, "y": 450_000.0},
     )
-    # TODO: temporary fix for older version of hydropandas that does not
-    # read Menyanthes time series names correctly.
-    # multiwell notebook data
-    fname = os.path.join(datadir, "MenyanthesTest.men")
-    # meny = ps.read.MenyData(fname)
+    fname = datadir / "MenyanthesTest.men"
     meny = ObsCollection.from_menyanthes(fname, Obs)
 
     oseries = meny.loc["Obsevation well", "obs"]
@@ -184,12 +174,12 @@ def _default_connector(conntype: str):
         default Connector based on type.
     """
     Conn = getattr(pst, conntype)
-    if Conn.conn_type == "arcticdb":
+    if Conn._conn_type == "arcticdb":
         uri = "lmdb://./arctic_db"
         conn = Conn("my_db", uri)
-    elif Conn.conn_type == "dict":
+    elif Conn._conn_type == "dict":
         conn = Conn("my_db")
-    elif Conn.conn_type == "pas":
+    elif Conn._conn_type == "pas":
         conn = Conn("my_db", "./pas_db")
     else:
         raise ValueError(f"Unrecognized connector type! '{conntype}'")

pastastore/extensions/__init__.py

@@ -1,14 +1,18 @@
 # ruff: noqa: D104 F401
+import logging
+
 from pastastore.extensions.accessor import (
     register_pastastore_accessor as register_pastastore_accessor,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def activate_hydropandas_extension():
-    """Register Plotly extension for pastas.Model class for interactive plotting."""
+    """Register HydroPandas extension for downloading time series data."""
     from pastastore.extensions.hpd import HydroPandasExtension as _
 
-    print(
-        "Registered HydroPandas extension in PastaStore class, "
+    logger.info(
+        "Registered HydroPandas extension in PastaStore, "
         "e.g. `pstore.hpd.download_bro_gmw()`."
     )

pastastore/extensions/hpd.py

@@ -18,6 +18,7 @@ from pastas.timeseries_utils import timestep_weighted_resample
 from tqdm.auto import tqdm
 
 from pastastore.extensions.accessor import register_pastastore_accessor
+from pastastore.typing import TimeSeriesLibs
 
 logger = logging.getLogger("hydropandas_extension")
 
@@ -68,7 +69,7 @@ class HydroPandasExtension:
 
     def add_obscollection(
         self,
-        libname: str,
+        libname: TimeSeriesLibs,
         oc: hpd.ObsCollection,
         kind: Optional[str] = None,
         data_column: Optional[str] = None,
@@ -113,7 +114,7 @@ class HydroPandasExtension:
 
     def add_observation(
         self,
-        libname: str,
+        libname: TimeSeriesLibs,
         obs: hpd.Obs,
         name: Optional[str] = None,
         kind: Optional[str] = None,
@@ -173,7 +174,7 @@ class HydroPandasExtension:
             )
 
         # gather metadata from obs object
-        metadata = {key: getattr(obs, key) for key in obs._metadata}
+        metadata = {key: getattr(obs, key) for key in obs._metadata}  # noqa: SLF001
 
         # convert np dtypes to builtins
         for k, v in metadata.items():
@@ -200,7 +201,9 @@ class HydroPandasExtension:
             action_msg = "added to"
 
         if libname == "oseries":
-            self._store.upsert_oseries(o.squeeze(axis=1), name, metadata=metadata)
+            self._store.upsert_oseries(
+                o.squeeze(axis=1), name, metadata=metadata, force=True
+            )
             logger.info(
                 "%sobservation '%s' %s oseries library.", source, name, action_msg
             )
@@ -208,7 +211,11 @@ class HydroPandasExtension:
             if kind is None:
                 raise ValueError("`kind` must be specified for stresses!")
             self._store.upsert_stress(
-                (o * unit_multiplier).squeeze(axis=1), name, kind, metadata=metadata
+                (o * unit_multiplier).squeeze(axis=1),
+                name,
+                kind,
+                metadata=metadata,
+                force=True,
             )
             logger.info(
                 "%sstress '%s' (kind='%s') %s stresses library.",
@@ -242,10 +249,10 @@ class HydroPandasExtension:
             tmintmax = self._store.get_tmin_tmax(
                 "oseries", names=[oseries] if oseries else None
             )
-        if tmin is None:
-            tmin = tmintmax.loc[:, "tmin"].min() - Timedelta(days=10 * 365)
-        if tmax is None:
-            tmax = tmintmax.loc[:, "tmax"].max()
+            if tmin is None:
+                tmin = tmintmax.loc[:, "tmin"].min() - Timedelta(days=10 * 365)
+            if tmax is None:
+                tmax = tmintmax.loc[:, "tmax"].max()
         return tmin, tmax
 
     @staticmethod
@@ -263,12 +270,13 @@ class HydroPandasExtension:
             observation series with normalized datetime index
         """
         if isinstance(obs, hpd.Obs):
-            metadata = {k: getattr(obs, k) for k in obs._metadata}
+            metadata = {k: getattr(obs, k) for k in obs._metadata}  # noqa: SLF001
         else:
             metadata = {}
         return obs.__class__(
             timestep_weighted_resample(
-                obs,
+                # force series, see https://github.com/pastas/pastas/issues/1020
+                obs.squeeze(),
                 obs.index.normalize(),
             ).rename(obs.name),
             **metadata,
@@ -585,6 +593,17 @@ class HydroPandasExtension:
     ):
         """Update meteorological data from KNMI in PastaStore.
 
+        Warning
+        -------
+        When fill_missing_obs is True, time series will be filled with observations
+        from nearest stations with data. If certain stations are generally more up to
+        date than others, this can lead to time series being permanently filled with
+        data from another station. To overwrite these filled values with data from the
+        actual station in a subsequent update, ensure that tmin is set to a date prior
+        to the first update call, or to be very safe, set tmin to the beginning of the
+        time series. This will force re-downloading of all data from the actual
+        station.
+
         Parameters
         ----------
         names : list of str, optional
@@ -596,7 +615,7 @@ class HydroPandasExtension:
             end time, by default None, which defaults to today
         fill_missing_obs : bool, optional
             if True, fill missing observations by getting observations from nearest
-            station with data.
+            station with data. Default is True.
         normalize_datetime_index : bool, optional
             if True, normalize the datetime so stress value at midnight represents
             the daily total, by default True.
@@ -625,7 +644,7 @@ class HydroPandasExtension:
 
         if tmax is not None:
             if tmintmax["tmax"].min() >= Timestamp(tmax):
-                logger.info(f"All KNMI stresses are up to date till {tmax}.")
+                logger.info("All KNMI stresses are up to date till %s.", tmax)
                 return
 
         try:
@@ -639,7 +658,7 @@ class HydroPandasExtension:
             maxtmax_rd = maxtmax_ev24 = Timestamp.today() - Timedelta(days=28)
             logger.info(
                 "Using 28 days (4 weeks) prior to today as maxtmax: %s."
-                % str(maxtmax_rd)
+                % maxtmax_rd.strftime("%Y-%m-%d")
             )
 
         for name in tqdm(names, desc="Updating KNMI meteo stresses"):
@@ -671,11 +690,14 @@ class HydroPandasExtension:
             # fix for duplicate station entry in metadata:
             stress_station = (
                 self._store.stresses.at[name, "station"]
-                if "station" in self._store.stresses.columns
+                if (
+                    "station" in self._store.stresses.columns
+                    and np.isfinite(self._store.stresses.at[name, "station"])
+                )
                 else None
             )
             if stress_station is not None and not isinstance(
-                stress_station, (int, np.integer)
+                stress_station, (int, np.integer, float)
             ):
                 stress_station = stress_station.squeeze().unique().item()
 
@@ -700,7 +722,7 @@ class HydroPandasExtension:
             elif unit == "mm":
                 unit_multiplier = 1e3
             elif unit.count("m") == 1 and unit.endswith("m"):
-                unit_multiplier = float(unit.replace("m", ""))
+                unit_multiplier = float(unit.replace("m", "").replace("*", ""))
             else:
                 unit_multiplier = 1.0
                 logger.warning(

pastastore/plotting.py

@@ -15,6 +15,9 @@ follows::
     pstore.maps.add_background_map(ax)  # for adding a background map
 """
 
+import logging
+import warnings
+
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
@@ -25,6 +28,8 @@ from matplotlib.colors import BoundaryNorm, LogNorm
 from matplotlib.lines import Line2D
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
+logger = logging.getLogger(__name__)
+
 
 class Plots:
     """Plot class for Pastastore.
@@ -101,7 +106,7 @@ class Plots:
             split=True is only supported if there are less than 20 time series
             to plot.
         """
-        names = self.pstore.conn._parse_names(names, libname)
+        names = self.pstore.conn.parse_names(names, libname)
 
         if len(names) > 20 and split:
             raise ValueError(
@@ -116,7 +121,7 @@ class Plots:
         else:
             axes = ax
 
-        tsdict = self.pstore.conn._get_series(
+        tsdict = self.pstore.conn._get_series(  # noqa: SLF001
             libname, names, progressbar=progressbar, squeeze=False
         )
         for i, (n, ts) in enumerate(tsdict.items()):
@@ -236,7 +241,7 @@ class Plots:
         ax : matplotlib.Axes
             axes handle
         """
-        names = self.pstore.conn._parse_names(names, "stresses")
+        names = self.pstore.conn.parse_names(names, "stresses")
         masknames = self.pstore.stresses.index.isin(names)
         stresses = self.pstore.stresses.loc[masknames]
 
@@ -315,7 +320,7 @@ class Plots:
         ax : matplotlib Axes
             The axes in which the data-availability is plotted
         """
-        names = self.pstore.conn._parse_names(names, libname)
+        names = self.pstore.conn.parse_names(names, libname)
 
         if libname == "stresses":
             masknames = self.pstore.stresses.index.isin(names)
@@ -324,7 +329,7 @@ class Plots:
                 mask = stresses["kind"] == kind
                 names = stresses.loc[mask].index.to_list()
 
-        series = self.pstore.conn._get_series(
+        series = self.pstore.conn._get_series(  # noqa: SLF001
             libname, names, progressbar=progressbar, squeeze=False
         ).values()
 
@@ -434,6 +439,7 @@ class Plots:
         cmap = plt.get_cmap(cmap, 256)
         cmap.set_over((1.0, 1.0, 1.0))
 
+        pc = None
         for i, s in enumerate(series):
             if not s.empty:
                 if dropna:
@@ -450,10 +456,14 @@ class Plots:
 
         # make a colorbar in an ax on the
         # right side, then set the current axes to ax again
-        cb = fig.colorbar(pc, ax=ax, cax=cax, extend="both")
-        cb.set_ticks(bounds)
-        cb.ax.set_yticklabels(labels)
-        cb.ax.minorticks_off()
+        if pc is not None:
+            cb = fig.colorbar(pc, ax=ax, cax=cax, extend="both")
+            cb.set_ticks(bounds)
+            cb.ax.set_yticklabels(labels)
+            cb.ax.minorticks_off()
+        else:
+            # nothing was plotted; skip colorbar to avoid UnboundLocalError
+            cb = None
 
         if set_yticks:
             ax.set_yticks(np.arange(0.5, len(series) + 0.5), minor=False)
@@ -600,6 +610,8 @@ class Plots:
         elif len(np.unique(onames)) > 1:
             names = modelnames
         cm = ps.CompareModels(models, names=names)
+        if ax is not None:
+            kwargs.setdefault("ax", ax)
         cm.plot(**kwargs)
         return cm
 
@@ -684,7 +696,7 @@ class Maps:
         --------
         self.add_background_map
         """
-        names = self.pstore.conn._parse_names(names, "stresses")
+        names = self.pstore.conn.parse_names(names, "stresses")
         if extent is not None:
             names = self.pstore.within(extent, names=names, libname="stresses")
         df = self.pstore.stresses.loc[names]
@@ -707,7 +719,7 @@ class Maps:
             kind_to_color = {k: f"C{i}" for i, k in enumerate(c.unique())}
             c = c.apply(lambda k: kind_to_color[k])
 
-        r = self._plotmap_dataframe(stresses.loc[mask0], c=c, figsize=figsize, **kwargs)
+        r = self.dataframe_scatter(stresses.loc[mask0], c=c, figsize=figsize, **kwargs)
         if "ax" in kwargs:
             ax = kwargs.pop("ax")
         else:
@@ -768,12 +780,12 @@ class Maps:
         --------
         self.add_background_map
         """
-        names = self.pstore.conn._parse_names(names, "oseries")
+        names = self.pstore.conn.parse_names(names, "oseries")
         if extent is not None:
             names = self.pstore.within(extent, names=names)
         oseries = self.pstore.oseries.loc[names]
         mask0 = (oseries["x"] != 0.0) | (oseries["y"] != 0.0)
-        r = self._plotmap_dataframe(oseries.loc[mask0], figsize=figsize, **kwargs)
+        r = self.dataframe_scatter(oseries.loc[mask0], figsize=figsize, **kwargs)
         if "ax" in kwargs:
             ax = kwargs["ax"]
         else:
@@ -829,7 +841,7 @@ class Maps:
 
         # mask out 0.0 coordinates
         mask0 = (models["x"] != 0.0) | (models["y"] != 0.0)
-        r = self._plotmap_dataframe(models.loc[mask0], figsize=figsize, **kwargs)
+        r = self.dataframe_scatter(models.loc[mask0], figsize=figsize, **kwargs)
         if "ax" in kwargs:
             ax = kwargs["ax"]
         else:
@@ -842,7 +854,7 @@ class Maps:
 
         return ax
 
-    def _map_helper(
+    def dataframe(
         self,
         df,
         column,
@@ -856,7 +868,7 @@ class Maps:
         backgroundmap=False,
         **kwargs,
     ):
-        """Help function for plotting values on map.
+        """Plot dataframe on a map.
 
         Parameters
         ----------
@@ -905,11 +917,12 @@ class Maps:
         }
         scatter_kwargs.update(kwargs)
 
-        ax = self._plotmap_dataframe(
+        ax = self.dataframe_scatter(
             df, column=column, figsize=figsize, **scatter_kwargs
         )
         if label:
-            df.set_index("index", inplace=True)
+            if "index" in df:
+                df.set_index("index", inplace=True)
             self.add_labels(df, ax, adjust=adjust)
 
         if backgroundmap:
@@ -982,7 +995,7 @@ class Maps:
         statsdf = statsdf.reset_index().set_index("oseries")
         df = statsdf.join(self.pstore.oseries, how="left")
 
-        return self._map_helper(
+        return self.dataframe(
             df,
             column=statistic,
             label=label,
@@ -999,6 +1012,7 @@ class Maps:
     def modelparam(
         self,
         parameter,
+        param_value="optimal",
         modelnames=None,
         label=True,
         adjust=False,
@@ -1017,6 +1031,9 @@ class Maps:
         ----------
         parameter: str
             name of the parameter, e.g. "rech_A" or "river_a"
+        param_value: str, optional
+            which parameter value to plot, by default "optimal", other options
+            are "initial", "pmin", "pmax"
         modelnames : list of str, optional
             list of modelnames to include
         label: bool, optional
@@ -1052,6 +1069,7 @@ class Maps:
         """
         paramdf = self.pstore.get_parameters(
             [parameter],
+            param_value=param_value,
             modelnames=modelnames,
             progressbar=progressbar,
             ignore_errors=True,
@@ -1064,7 +1082,7 @@ class Maps:
         paramdf = paramdf.reset_index().set_index("oseries")
         df = paramdf.join(self.pstore.oseries, how="left")
 
-        return self._map_helper(
+        return self.dataframe(
             df,
             column=parameter,
             label=label,
@@ -1133,14 +1151,14 @@ class Maps:
         self.add_background_map
         """
         signature_df = self.pstore.get_signatures(
-            [signature],
             names=names,
+            signatures=[signature],
             progressbar=progressbar,
             ignore_errors=True,
-        )
+        ).transpose()
         df = signature_df.join(self.pstore.oseries, how="left")
 
-        return self._map_helper(
+        return self.dataframe(
             df,
             column=signature,
             label=label,
@@ -1154,8 +1172,17 @@ class Maps:
             **kwargs,
         )
 
+    def _plotmap_dataframe(self, *args, **kwargs):
+        """Deprecated, use dataframe method."""  # noqa: D401
+        warnings.warn(
+            "maps._plotmap_dataframe is deprecated, use maps.dataframe_scatter instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.dataframe_scatter(*args, **kwargs)
+
     @staticmethod
-    def _plotmap_dataframe(
+    def dataframe_scatter(
         df,
         x="x",
         y="y",
@@ -1165,9 +1192,7 @@ class Maps:
         figsize=(10, 8),
         **kwargs,
     ):
-        """Plot dataframe with point locations (internal method).
-
-        Can be called directly for more control over plot characteristics.
+        """Plot dataframe.
 
         Parameters
         ----------
@@ -1310,10 +1335,12 @@ class Maps:
                         "metadata_source must be either 'model' or 'store'!"
                     )
                 if np.isnan(xi) or np.isnan(yi):
-                    print(f"No x,y-data for {istress.name}!")
+                    logger.warning("No x,y-data for %s!", istress.name)
                     continue
                 if xi == 0.0 or yi == 0.0:
-                    print(f"x,y-data is 0.0 for {istress.name}, not plotting!")
+                    logger.warning(
+                        "x,y-data is 0.0 for %s, not plotting!", istress.name
+                    )
                     continue
 
                 stresses.loc[istress.name, :] = (xi, yi, name, f"C{count % 10}")
@@ -1476,7 +1503,7 @@ class Maps:
             m_idx = self.pstore.search(libname="models", s=model_names)
         else:
             m_idx = self.pstore.model_names
-        struct = self.pstore.get_model_timeseries_names(progressbar=False).loc[m_idx]
+        struct = self.pstore.get_model_time_series_names(progressbar=False).loc[m_idx]
 
         oseries = self.pstore.oseries
         stresses = self.pstore.stresses
@@ -1614,23 +1641,27 @@ class Maps:
         ctx.add_basemap(ax, source=providers[map_provider], crs=proj.srs, **kwargs)
 
     @staticmethod
-    def add_labels(df, ax, adjust=False, objects=None, **kwargs):
+    def add_labels(
+        df, ax, adjust=False, objects=None, adjust_text_kwargs=None, **kwargs
+    ):
         """Add labels to points on plot.
 
         Uses dataframe index to label points.
 
         Parameters
         ----------
-        df: pd.DataFrame
+        df : pd.DataFrame
             DataFrame containing x, y - data. Index is used as label
-        ax: matplotlib.Axes
+        ax : matplotlib.Axes
             axes object to label points on
-        adjust: bool
+        adjust : bool
             automated smart label placement using adjustText
         objects : list of matplotlib objects
             use to avoid labels overlapping markers
-        **kwargs:
-            keyword arguments to ax.annotate or adjusttext
+        adjust_text_kwargs
+            keyword arguments to adjust_text function, only used if adjust=True
+        **kwargs
+            keyword arguments to ax.annotate or ax.text
         """
         stroke = [patheffects.withStroke(linewidth=3, foreground="w")]
         fontsize = kwargs.pop("fontsize", 10)
@@ -1647,14 +1678,15 @@ class Maps:
                         name,
                         fontsize=fontsize,
                         **{"path_effects": stroke},
+                        **kwargs,
                     )
                 )
-
+            if adjust_text_kwargs is None:
+                adjust_text_kwargs = {}
             adjust_text(
                 texts,
                 objects=objects,
                 force_text=(0.05, 0.10),
-                **kwargs,
                 **{
                     "arrowprops": {
                         "arrowstyle": "-",
@@ -1662,6 +1694,7 @@ class Maps:
                         "alpha": 0.5,
                     }
                 },
+                **adjust_text_kwargs,
             )
 
         else: