diff --git a/pygmt/src/plot.py b/pygmt/src/plot.py index 0ed42569386..3206c5c053a 100644 --- a/pygmt/src/plot.py +++ b/pygmt/src/plot.py @@ -209,48 +209,50 @@ def plot( # noqa: PLR0912 kwargs = self._preprocess(**kwargs) kind = data_kind(data, x, y) - extra_arrays = [] - if kwargs.get("S") is not None and kwargs["S"][0] in "vV" and direction is not None: - extra_arrays.extend(direction) - elif ( - kwargs.get("S") is None - and kind == "geojson" - and data.geom_type.isin(["Point", "MultiPoint"]).all() - ): # checking if the geometry of a geoDataFrame is Point or MultiPoint - kwargs["S"] = "s0.2c" - elif kwargs.get("S") is None and kind == "file" and str(data).endswith(".gmt"): - # checking that the data is a file path to set default style - try: - with Path(which(data)).open(encoding="utf8") as file: - line = file.readline() - if "@GMULTIPOINT" in line or "@GPOINT" in line: - # if the file is gmt style and geometry is set to Point - kwargs["S"] = "s0.2c" - except FileNotFoundError: - pass - if is_nonstr_iter(kwargs.get("G")): - if kind != "vectors": - raise GMTInvalidInput( - "Can't use arrays for fill if data is matrix or file." - ) - extra_arrays.append(kwargs["G"]) - del kwargs["G"] - if size is not None: - if kind != "vectors": - raise GMTInvalidInput( - "Can't use arrays for 'size' if data is a matrix or file." - ) - extra_arrays.append(size) + if kind == "vectors": # Add more columns for vectors input + # Parameters for vector styles + if ( + kwargs.get("S") is not None + and kwargs["S"][0] in "vV" + and is_nonstr_iter(direction) + ): + extra_arrays.extend(direction) + # Fill + if is_nonstr_iter(kwargs.get("G")): + extra_arrays.append(kwargs.get("G")) + del kwargs["G"] + # Size + if is_nonstr_iter(size): + extra_arrays.append(size) + # Intensity and transparency + for flag in ["I", "t"]: + if is_nonstr_iter(kwargs.get(flag)): + extra_arrays.append(kwargs.get(flag)) + kwargs[flag] = "" + else: + for name, value in [ + ("direction", direction), + ("fill", kwargs.get("G")), + ("size", size), + ("intensity", kwargs.get("I")), + ("transparency", kwargs.get("t")), + ]: + if is_nonstr_iter(value): + raise GMTInvalidInput(f"'{name}' can't be 1-D array if 'data' is used.") - for flag in ["I", "t"]: - if is_nonstr_iter(kwargs.get(flag)): - if kind != "vectors": - raise GMTInvalidInput( - f"Can't use arrays for {plot.aliases[flag]} if data is matrix or file." - ) - extra_arrays.append(kwargs[flag]) - kwargs[flag] = "" + # Set the default style if data has a geometry of Point or MultiPoint + if kwargs.get("S") is None: + if kind == "geojson" and data.geom_type.isin(["Point", "MultiPoint"]).all(): + kwargs["S"] = "s0.2c" + elif kind == "file" and str(data).endswith(".gmt"): # OGR_GMT file + try: + with Path(which(data)).open() as file: + line = file.readline() + if "@GMULTIPOINT" in line or "@GPOINT" in line: + kwargs["S"] = "s0.2c" + except FileNotFoundError: + pass with Session() as lib: with lib.virtualfile_in(