Merge branch 'main' into copilot/update-figure-map-usage

Author: seisman

examples/gallery/embellishments/colorbars_multiple.py

@@ -10,6 +10,7 @@
 
 # %%
 import pygmt
+from pygmt.params import Axis
 
 fig = pygmt.Figure()
 
@@ -28,15 +29,17 @@
         pygmt.makecpt(cmap="gmt/geo", series=[-8000, 8000])
         # "R?" means Winkel Tripel projection with map width automatically determined
         # from the subplot width.
-        fig.grdimage(grid=grid_globe, projection="R?", region="g", frame="a")
+        fig.basemap(projection="R?", region="g", frame=Axis(annot=True))
+        fig.grdimage(grid=grid_globe)
         fig.colorbar(annot=4000, tick=2000, label="Elevation", unit="m")
     # Activate the second panel so that the colormap created by the makecpt function is
     # a panel-level CPT
     with fig.set_panel(panel=1):
         pygmt.makecpt(cmap="gmt/globe", series=[-6000, 3000])
         # "M?" means Mercator projection with map width also automatically determined
         # from the subplot width.
-        fig.grdimage(grid=grid_subset, projection="M?", region=subset_region, frame="a")
+        fig.basemap(projection="M?", region=subset_region, frame=Axis(annot=True))
+        fig.grdimage(grid=grid_subset)
         fig.colorbar(annot=2000, tick=1000, label="Elevation", unit="m")
 
 fig.show()

examples/gallery/embellishments/inset.py

@@ -9,25 +9,28 @@
 
 # %%
 import pygmt
-from pygmt.params import Box, Position
+from pygmt.params import Axis, Box, Position
 
 fig = pygmt.Figure()
-# Create the primary figure, setting the region to Madagascar, the land color to
-# "brown", the water to "lightblue", the shorelines width to "thin", and adding a frame
-fig.coast(region="MG+r2", land="brown", water="lightblue", shorelines="thin", frame="a")
-# Create an inset, placing it in the Top Left (TL) corner with a width of 3.5 cm and
-# x- and y-offsets of 0.2 cm. The clearance is set to 0, and the border is "gold" with a
+# Create the primary figure, setting the region to Madagascar
+fig.basemap(region="MG+r2", projection="M12c", frame=Axis(annot=True))
+# Set the land color to "brown", the water color to "lightblue", and the shorelines
+# width to "thin"
+fig.coast(land="brown", water="lightblue", shorelines="thin")
+
+# Create an inset, placing it in the Top Left (TL) corner with a width of 3.5 cm and x-
+# and y-offsets of 0.2 cm. The clearance is set to 0, and the border is "gold" with a
 # pen thickness of 1.5 points.
 with fig.inset(
     position=Position("TL", offset=0.2),
     width=3.5,
     clearance=0,
     box=Box(pen="1.5p,gold"),
 ):
-    # Create a figure in the inset using coast. This example uses the azimuthal
-    # orthogonal projection centered at 47E, 20S. The land color is set to "gray" and
-    # Madagascar is highlighted in "red3".
-    fig.coast(
-        region="g", projection="G47/-20/?", land="gray", water="white", dcw="MG+gred3"
-    )
+    # Create a map within the inset. This example uses the azimuthal orthogonal
+    # projection centered at 47 E, 20 S. The question mark is required for the
+    # automatic size determination by PyGMT
+    fig.basemap(region="g", projection="G47/-20/?", frame=0)
+    # Madagascar is highlighted in "red3"
+    fig.coast(land="gray", water="white", dcw="MG+gred3")
 fig.show()

examples/gallery/embellishments/inset_rectangle_region.py

@@ -9,15 +9,19 @@
 
 # %%
 import pygmt
-from pygmt.params import Box, Position
+from pygmt.params import Axis, Box, Frame, Position
 
 # Set the region of the main figure
 region = [137.5, 141, 34, 37]
 
 fig = pygmt.Figure()
 # Plot the base map of the main figure. Universal Transverse Mercator (UTM) projection
 # is used and the UTM zone is set to be "54S".
-fig.basemap(region=region, projection="U54S/12c", frame=["WSne", "af"])
+fig.basemap(
+    region=region,
+    projection="U54S/12c",
+    frame=Frame(axes="WSne", axis=Axis(annot=True, tick=True)),
+)
 
 # Set the land color to "lightbrown", the water color to "azure1", the shoreline width
 # to "2p", and the area threshold to 1000 km^2 for the main figure.

examples/gallery/embellishments/legend.py

@@ -16,7 +16,7 @@
 # %%
 import numpy as np
 import pygmt
-from pygmt.params import Position
+from pygmt.params import Axis, Frame, Position
 
 # Set up some test data
 x = np.arange(-10, 10.2, 0.2)
@@ -31,7 +31,11 @@
 fig.basemap(
     projection="X10c/7c",
     region=[-10, 10, -3.5, 3.5],
-    frame=["WSne", "xaf+lx", "ya1f0.5+ly"],
+    frame=Frame(
+        axes="WSne",
+        xaxis=Axis(annot=True, tick=True, label="x"),
+        yaxis=Axis(annot=1, tick=0.5, label="y"),
+    ),
 )
 
 # -----------------------------------------------------------------------------

examples/gallery/embellishments/scalebar.py

@@ -8,13 +8,17 @@
 
 # %%
 import pygmt
-from pygmt.params import Box, Position
+from pygmt.params import Axis, Box, Frame, Position
 
 # Create a new Figure instance
 fig = pygmt.Figure()
 
 # Mercator projection with 10 centimeters width
-fig.basemap(region=[-45, -25, -15, 0], projection="M0/0/10c", frame=["WSne", "af"])
+fig.basemap(
+    region=[-45, -25, -15, 0],
+    projection="M0/0/10c",
+    frame=Frame(axes="WSne", axis=Axis(annot=True, tick=True)),
+)
 
 # --- Top Left: Add a plain scale bar ---
 # It is placed based on geographic coordinates 42° West and 1° South, applies at the
@@ -67,7 +71,11 @@
 
 fig = pygmt.Figure()
 
-fig.basemap(region=[-45, -25, -15, 0], projection="M10c", frame=["WSne", "af"])
+fig.basemap(
+    region=[-45, -25, -15, 0],
+    projection="M10c",
+    frame=Frame(axes="WSne", axis=Axis(annot=True, tick=True)),
+)
 fig.coast(land="tan", water="steelblue")
 fig.scalebar(
     position=Position("BL", cstype="inside", offset=1),

examples/gallery/histograms/blockm.py

@@ -10,6 +10,7 @@
 
 # %%
 import pygmt
+from pygmt.params import Axis, Frame
 
 # Load sample data
 data = pygmt.datasets.load_sample_data(name="japan_quakes")
@@ -29,12 +30,15 @@
 # Convert to grid
 grd = pygmt.xyz2grd(data=df, region=region, spacing=spacing)
 
-fig.grdimage(
-    grid=grd,
+fig.basemap(
     region=region,
-    frame=["af", "+tMean earthquake depth inside each block"],
-    cmap="SCM/batlow",
+    projection="M11c",
+    frame=Frame(
+        axis=Axis(annot=True, tick=True),
+        title="Mean earthquake depth inside each block",
+    ),
 )
+fig.grdimage(grid=grd, cmap="SCM/batlow")
 # Plot slightly transparent landmasses on top
 fig.coast(land="darkgray", transparency=40)
 # Plot original data points
@@ -48,12 +52,14 @@
 df = pygmt.blockmean(data=data, region=region, spacing=spacing, summary="n")
 grd = pygmt.xyz2grd(data=df, region=region, spacing=spacing)
 
-fig.grdimage(
-    grid=grd,
+fig.basemap(
     region=region,
-    frame=["af", "+tNumber of points inside each block"],
-    cmap="SCM/batlow",
+    projection="M11c",
+    frame=Frame(
+        axis=Axis(annot=True, tick=True), title="Number of points inside each block"
+    ),
 )
+fig.grdimage(grid=grd, cmap="SCM/batlow")
 fig.coast(land="darkgray", transparency=40)
 fig.plot(x=data.longitude, y=data.latitude, style="c0.3c", fill="white", pen="1p,black")
 fig.colorbar(label="Count")