From a7afb08bf1d53c2cede0b02c5b6d579df78284ef Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Sat, 28 Sep 2024 13:29:02 +0200 Subject: [PATCH 1/6] Use one color per category --- examples/projections/azim/azim_equidistant.py | 4 ++- .../azim/azim_general_perspective.py | 5 ++-- .../azim/azim_general_stereographic.py | 8 ++++- examples/projections/azim/azim_gnomonic.py | 4 ++- examples/projections/azim/azim_lambert.py | 4 ++- .../projections/azim/azim_orthographic.py | 4 ++- examples/projections/conic/conic_albers.py | 6 +++- .../projections/conic/conic_equidistant.py | 5 ++-- examples/projections/conic/conic_lambert.py | 5 ++-- examples/projections/conic/polyconic.py | 6 ++-- examples/projections/cyl/cyl_cassini.py | 8 ++++- examples/projections/cyl/cyl_equal_area.py | 4 +-- examples/projections/cyl/cyl_equidistant.py | 4 +-- examples/projections/cyl/cyl_mercator.py | 8 ++++- examples/projections/cyl/cyl_miller.py | 5 ++-- .../projections/cyl/cyl_oblique_mercator.py | 15 ++++++++-- examples/projections/cyl/cyl_stereographic.py | 8 ++++- .../cyl/cyl_transverse_mercator.py | 5 ++-- .../cyl/cyl_universal_transverse_mercator.py | 5 ++-- examples/projections/misc/misc_eckertIV.py | 2 +- examples/projections/misc/misc_eckertVI.py | 2 +- examples/projections/misc/misc_hammer.py | 2 +- examples/projections/misc/misc_mollweide.py | 2 +- examples/projections/misc/misc_robinson.py | 2 +- examples/projections/misc/misc_sinusoidal.py | 2 +- .../projections/misc/misc_van_der_grinten.py | 2 +- .../projections/misc/misc_winkel_tripel.py | 2 +- .../projections/nongeo/cartesian_linear.py | 17 +++-------- .../nongeo/cartesian_logarithmic.py | 21 +++++++------ .../projections/nongeo/cartesian_power.py | 28 ++++++++--------- examples/projections/nongeo/polar.py | 30 ++++++++----------- 31 files changed, 123 insertions(+), 102 deletions(-) diff --git a/examples/projections/azim/azim_equidistant.py b/examples/projections/azim/azim_equidistant.py index bda1eb03cbf..55dfeb43e4d 100644 --- a/examples/projections/azim/azim_equidistant.py +++ b/examples/projections/azim/azim_equidistant.py @@ -22,5 +22,7 @@ import pygmt fig = pygmt.Figure() -fig.coast(projection="E-100/40/15c", region="g", frame="g", land="gray") +fig.coast( + region="g", projection="E-100/40/15c", frame="afg", land="gray", water="cornsilk" +) fig.show() diff --git a/examples/projections/azim/azim_general_perspective.py b/examples/projections/azim/azim_general_perspective.py index 784aadfdb74..d3bb1a34b9f 100644 --- a/examples/projections/azim/azim_general_perspective.py +++ b/examples/projections/azim/azim_general_perspective.py @@ -33,9 +33,10 @@ fig = pygmt.Figure() fig.coast( - projection="G4/52/12c+a30+t45+v60/60+w0+z250", region="g", - frame=["x10g10", "y5g5"], + projection="G4/52/12c+a30+t45+v60/60+w0+z250", + frame="afg", land="gray", + water="cornsilk", ) fig.show() diff --git a/examples/projections/azim/azim_general_stereographic.py b/examples/projections/azim/azim_general_stereographic.py index 6b527acb994..a313cca9b00 100644 --- a/examples/projections/azim/azim_general_stereographic.py +++ b/examples/projections/azim/azim_general_stereographic.py @@ -22,5 +22,11 @@ import pygmt fig = pygmt.Figure() -fig.coast(region=[4, 14, 52, 57], projection="S0/90/12c", frame="ag", land="gray") +fig.coast( + region=[4, 14, 52, 57], + projection="S0/90/12c", + frame="afg", + land="gray", + water="cornsilk", +) fig.show() diff --git a/examples/projections/azim/azim_gnomonic.py b/examples/projections/azim/azim_gnomonic.py index 3fdfe813c85..03076803896 100644 --- a/examples/projections/azim/azim_gnomonic.py +++ b/examples/projections/azim/azim_gnomonic.py @@ -23,5 +23,7 @@ import pygmt fig = pygmt.Figure() -fig.coast(projection="F-90/15/12c", region="g", frame="20g20", land="gray") +fig.coast( + region="g", projection="F-90/15/12c", frame="afg", land="gray", water="cornsilk" +) fig.show() diff --git a/examples/projections/azim/azim_lambert.py b/examples/projections/azim/azim_lambert.py index e4f0359848c..23dff45fada 100644 --- a/examples/projections/azim/azim_lambert.py +++ b/examples/projections/azim/azim_lambert.py @@ -20,5 +20,7 @@ import pygmt fig = pygmt.Figure() -fig.coast(region="g", frame="afg", land="gray", projection="A30/-20/60/12c") +fig.coast( + region="g", projection="A30/-20/60/12c", frame="afg", land="gray", water="cornsilk" +) fig.show() diff --git a/examples/projections/azim/azim_orthographic.py b/examples/projections/azim/azim_orthographic.py index 0583adc46a3..58ffa01a3da 100644 --- a/examples/projections/azim/azim_orthographic.py +++ b/examples/projections/azim/azim_orthographic.py @@ -21,5 +21,7 @@ import pygmt fig = pygmt.Figure() -fig.coast(projection="G10/52/12c", region="g", frame="g", land="gray") +fig.coast( + region="g", projection="G10/52/12c", frame="afg", land="gray", water="cornsilk" +) fig.show() diff --git a/examples/projections/conic/conic_albers.py b/examples/projections/conic/conic_albers.py index e09ca9e42f9..12398cf79fb 100644 --- a/examples/projections/conic/conic_albers.py +++ b/examples/projections/conic/conic_albers.py @@ -26,6 +26,10 @@ fig = pygmt.Figure() # Use the ISO country code for Brazil and add a padding of 2 degrees (+R2) fig.coast( - projection="B-55/-15/-25/0/12c", region="BR+R2", frame="afg", land="gray", borders=1 + region="BR+R2", + projection="B-55/-15/-25/0/12c", + frame="afg", + land="gray", + water="dodgerblue4", ) fig.show() diff --git a/examples/projections/conic/conic_equidistant.py b/examples/projections/conic/conic_equidistant.py index d00c879b2b9..757b842bffa 100644 --- a/examples/projections/conic/conic_equidistant.py +++ b/examples/projections/conic/conic_equidistant.py @@ -20,11 +20,10 @@ fig = pygmt.Figure() fig.coast( - shorelines="1/0.5p", region=[-88, -70, 18, 24], projection="D-79/21/19/23/12c", - land="lightgreen", - water="lightblue", frame="afg", + land="gray", + water="dodgerblue4", ) fig.show() diff --git a/examples/projections/conic/conic_lambert.py b/examples/projections/conic/conic_lambert.py index 92eaf9d78d3..99746a9c1d1 100644 --- a/examples/projections/conic/conic_lambert.py +++ b/examples/projections/conic/conic_lambert.py @@ -23,12 +23,11 @@ fig = pygmt.Figure() fig.coast( - shorelines="1/0.5p", region=[-130, -70, 24, 52], projection="L-100/35/33/45/12c", - land="gray", - borders=["1/thick,black", "2/thin,black"], frame="afg", + land="gray", + water="dodgerblue4", ) fig.show() diff --git a/examples/projections/conic/polyconic.py b/examples/projections/conic/polyconic.py index ddf661ee2a5..c82d389b162 100644 --- a/examples/projections/conic/polyconic.py +++ b/examples/projections/conic/polyconic.py @@ -30,12 +30,10 @@ fig = pygmt.Figure() fig.coast( - shorelines="1/0.5p", region=[-180, -20, 0, 90], projection="Poly/12c", + frame="afg", land="gray", - borders="1/thick,black", - frame="afg10", + water="dodgerblue4", ) - fig.show() diff --git a/examples/projections/cyl/cyl_cassini.py b/examples/projections/cyl/cyl_cassini.py index 0cfef5d6530..2d9f37ca3af 100644 --- a/examples/projections/cyl/cyl_cassini.py +++ b/examples/projections/cyl/cyl_cassini.py @@ -23,5 +23,11 @@ fig = pygmt.Figure() # Use the ISO code for Madagascar (MG) and pad it by 2 degrees (+R2) -fig.coast(projection="C47/-19/12c", region="MG+R2", frame="afg", land="gray", borders=1) +fig.coast( + region="MG+R2", + projection="C47/-19/12c", + frame="afg", + land="darkgreen", + water="lightgray", +) fig.show() diff --git a/examples/projections/cyl/cyl_equal_area.py b/examples/projections/cyl/cyl_equal_area.py index ac429beae28..5e2c9442e41 100644 --- a/examples/projections/cyl/cyl_equal_area.py +++ b/examples/projections/cyl/cyl_equal_area.py @@ -20,8 +20,8 @@ fig.coast( region="d", projection="Y35/30/12c", - water="dodgerblue", - shorelines="thinnest", frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_equidistant.py b/examples/projections/cyl/cyl_equidistant.py index dad092e167a..c76508806ff 100644 --- a/examples/projections/cyl/cyl_equidistant.py +++ b/examples/projections/cyl/cyl_equidistant.py @@ -24,8 +24,8 @@ fig.coast( region="d", projection="Q12c", - land="tan4", - water="lightcyan", frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_mercator.py b/examples/projections/cyl/cyl_mercator.py index 8e654af00f1..a62f3abfa74 100644 --- a/examples/projections/cyl/cyl_mercator.py +++ b/examples/projections/cyl/cyl_mercator.py @@ -24,5 +24,11 @@ import pygmt fig = pygmt.Figure() -fig.coast(region=[0, 360, -80, 80], frame="afg", land="red", projection="M0/0/12c") +fig.coast( + region=[0, 360, -80, 80], + projection="M0/0/12c", + frame="afg", + land="darkgreen", + water="lightgray", +) fig.show() diff --git a/examples/projections/cyl/cyl_miller.py b/examples/projections/cyl/cyl_miller.py index ebfaed19770..e0b9d6b9deb 100644 --- a/examples/projections/cyl/cyl_miller.py +++ b/examples/projections/cyl/cyl_miller.py @@ -23,9 +23,8 @@ fig.coast( region=[-180, 180, -80, 80], projection="J-65/12c", - land="khaki", - water="azure", - shorelines="thinnest", frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_oblique_mercator.py b/examples/projections/cyl/cyl_oblique_mercator.py index 0942e5183eb..c08dfd11881 100644 --- a/examples/projections/cyl/cyl_oblique_mercator.py +++ b/examples/projections/cyl/cyl_oblique_mercator.py @@ -31,7 +31,8 @@ # Set bottom left and top right coordinates of the figure with "+r" region="-122/35/-107/22+r", frame="afg", - land="gray", + land="darkgreen", + water="lightgray", ) fig.show() @@ -47,7 +48,11 @@ fig = pygmt.Figure() fig.coast( - projection="Ob130/35/25/35/3c", region="130/35/145/40+r", frame="afg", land="gray" + projection="Ob130/35/25/35/3c", + region="130/35/145/40+r", + frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() @@ -63,7 +68,11 @@ fig = pygmt.Figure() fig.coast( - projection="Oc280/25.5/22/69/4c", region="270/20/305/25+r", frame="afg", land="gray" + projection="Oc280/25.5/22/69/4c", + region="270/20/305/25+r", + frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_stereographic.py b/examples/projections/cyl/cyl_stereographic.py index 00079d29823..0e8867e8b27 100644 --- a/examples/projections/cyl/cyl_stereographic.py +++ b/examples/projections/cyl/cyl_stereographic.py @@ -32,5 +32,11 @@ import pygmt fig = pygmt.Figure() -fig.coast(region="g", frame="afg", land="gray", projection="Cyl_stere/30/-20/12c") +fig.coast( + region="g", + projection="Cyl_stere/30/-20/12c", + frame="afg", + land="darkgreen", + water="lightgray", +) fig.show() diff --git a/examples/projections/cyl/cyl_transverse_mercator.py b/examples/projections/cyl/cyl_transverse_mercator.py index 62c7988ebc2..2c848545f56 100644 --- a/examples/projections/cyl/cyl_transverse_mercator.py +++ b/examples/projections/cyl/cyl_transverse_mercator.py @@ -23,9 +23,8 @@ fig.coast( region=[20, 50, 30, 45], projection="T35/12c", - land="lightbrown", - water="seashell", - shorelines="thinnest", frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_universal_transverse_mercator.py b/examples/projections/cyl/cyl_universal_transverse_mercator.py index 815eb2fe639..1cb44dbd88a 100644 --- a/examples/projections/cyl/cyl_universal_transverse_mercator.py +++ b/examples/projections/cyl/cyl_universal_transverse_mercator.py @@ -44,9 +44,8 @@ fig.coast( region=[127.5, 128.5, 26, 27], projection="U52R/12c", - land="lightgreen", - water="lightblue", - shorelines="thinnest", frame="afg", + land="darkgreen", + water="lightgray", ) fig.show() diff --git a/examples/projections/misc/misc_eckertIV.py b/examples/projections/misc/misc_eckertIV.py index 6880ebbd513..b13c9833405 100644 --- a/examples/projections/misc/misc_eckertIV.py +++ b/examples/projections/misc/misc_eckertIV.py @@ -18,5 +18,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="Kf12c", land="ivory", water="bisque4", frame="afg") +fig.coast(region="d", projection="Kf12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_eckertVI.py b/examples/projections/misc/misc_eckertVI.py index 1d49feed512..a4c4f0f4291 100644 --- a/examples/projections/misc/misc_eckertVI.py +++ b/examples/projections/misc/misc_eckertVI.py @@ -19,5 +19,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="Ks12c", land="ivory", water="bisque4", frame="afg") +fig.coast(region="d", projection="Ks12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_hammer.py b/examples/projections/misc/misc_hammer.py index db881f30ac9..4ba55d0f428 100644 --- a/examples/projections/misc/misc_hammer.py +++ b/examples/projections/misc/misc_hammer.py @@ -19,5 +19,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="H12c", land="black", water="cornsilk", frame="afg") +fig.coast(region="d", projection="H12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_mollweide.py b/examples/projections/misc/misc_mollweide.py index 28525c5e6ab..ee5f33777c0 100644 --- a/examples/projections/misc/misc_mollweide.py +++ b/examples/projections/misc/misc_mollweide.py @@ -20,5 +20,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="W12c", land="tomato1", water="skyblue", frame="ag") +fig.coast(region="d", projection="W12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_robinson.py b/examples/projections/misc/misc_robinson.py index 1e33687232e..4e7514f7ee4 100644 --- a/examples/projections/misc/misc_robinson.py +++ b/examples/projections/misc/misc_robinson.py @@ -30,5 +30,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="N12c", land="goldenrod", water="snow2", frame="afg") +fig.coast(region="d", projection="N12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_sinusoidal.py b/examples/projections/misc/misc_sinusoidal.py index af6d484bfd8..ca6389fdc9e 100644 --- a/examples/projections/misc/misc_sinusoidal.py +++ b/examples/projections/misc/misc_sinusoidal.py @@ -20,5 +20,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="I12c", land="coral4", water="azure3", frame="afg") +fig.coast(region="d", projection="I12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_van_der_grinten.py b/examples/projections/misc/misc_van_der_grinten.py index a48c5213bed..f7098ff6c5c 100644 --- a/examples/projections/misc/misc_van_der_grinten.py +++ b/examples/projections/misc/misc_van_der_grinten.py @@ -19,5 +19,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="V12c", land="gray", water="cornsilk", frame="afg") +fig.coast(region="d", projection="V12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/misc/misc_winkel_tripel.py b/examples/projections/misc/misc_winkel_tripel.py index 301e552858f..51c9d741745 100644 --- a/examples/projections/misc/misc_winkel_tripel.py +++ b/examples/projections/misc/misc_winkel_tripel.py @@ -28,5 +28,5 @@ fig = pygmt.Figure() # Use region "d" to specify global region (-180/180/-90/90) -fig.coast(region="d", projection="R12c", land="burlywood4", water="wheat1", frame="afg") +fig.coast(region="d", projection="R12c", frame="afg", land="ivory", water="bisque4") fig.show() diff --git a/examples/projections/nongeo/cartesian_linear.py b/examples/projections/nongeo/cartesian_linear.py index 2e0ac9db365..134ecd079e9 100644 --- a/examples/projections/nongeo/cartesian_linear.py +++ b/examples/projections/nongeo/cartesian_linear.py @@ -23,17 +23,8 @@ import pygmt fig = pygmt.Figure() -fig.plot( - # The x and y parameters determine the coordinates of lines - x=[3, 9, 2], - y=[4, 9, 37], - pen="3p,red", - # The region parameter sets the x and y ranges of the - # Cartesian projection - region=[0, 10, 0, 50], - projection="X15c/10c", - # "WSne" is passed to the frame parameter to put annotations - # only on the left and bottom axes - frame=["af", "WSne"], -) +# The region parameter is specified as x_min, x_max, y_min, y_max +fig.basemap(region=[0, 10, 0, 50], projection="X15c/10c", frame="afg") +fig.plot(x=[3, 9, 2], y=[4, 9, 37], pen="2p,black") +fig.plot(x=[3, 9, 2], y=[4, 9, 37], style="s0.5c", fill="orange", pen="black") fig.show() diff --git a/examples/projections/nongeo/cartesian_logarithmic.py b/examples/projections/nongeo/cartesian_logarithmic.py index abc300e0870..9e7feaedf13 100644 --- a/examples/projections/nongeo/cartesian_logarithmic.py +++ b/examples/projections/nongeo/cartesian_logarithmic.py @@ -26,21 +26,20 @@ ypoints = xpoints**0.5 fig = pygmt.Figure() -fig.plot( +fig.basemap( region=[1, 100, 0, 10], # Set a logarithmic transformation on the x-axis projection="X15cl/10c", # Set the figures frame and color as well as # annotations, ticks, and gridlines - frame=["WSne+gbisque", "xa2g3", "ya2f1g2"], - x=xline, - y=yline, - # Set the line thickness to "1p", the color to "blue", - # and the style to "-", i.e. "dashed" - pen="1p,blue,-", + frame=["WSne", "xa2g3", "ya2f1g2"], ) -# Plot square root values as points on the line -# Style of points is 0.3 cm squares, color fill is "red" with a "black" outline -# Points are not clipped if they go off the figure -fig.plot(x=xpoints, y=ypoints, style="s0.3c", fill="red", no_clip=True, pen="black") + +# Set the line thickness to "2p", the color to "black", and the style to "dashed" +fig.plot(x=xline, y=yline, pen="2p,black,dashed") + +# Plot the square root values ontop of the line +# Use circles with a diameter of 0.5 centimeters, a "orange" fill and a "black" outline +# Symbols are not clipped if they go off the figure +fig.plot(x=xpoints, y=ypoints, style="s0.5c", fill="orange", pen="black", no_clip=True) fig.show() diff --git a/examples/projections/nongeo/cartesian_power.py b/examples/projections/nongeo/cartesian_power.py index cb4171930db..e3d8fca00e5 100644 --- a/examples/projections/nongeo/cartesian_power.py +++ b/examples/projections/nongeo/cartesian_power.py @@ -22,23 +22,21 @@ xvalues = yvalues**2 fig = pygmt.Figure() -fig.plot( +fig.basemap( region=[0, 100, 0, 10], # Set the power transformation of the x-axis, with a power of 0.5 projection="X15cp0.5/10c", - # Set the figures frame and color as well as - # annotations and ticks - # The "p" forces to show only square numbers as annotations - # of the x-axis - frame=["WSne+givory", "xa1p", "ya2f1"], - # Set the line thickness to "thick" (equals "1p", i.e. 1 point) - # Use as color "black" (default) and as style "solid" (default) - pen="thick,black,solid", - x=xvalues, - y=yvalues, + # Set the figures frame as well as annotations and ticks + # The "p" forces to show only square numbers as annotations of the x-axis + frame=["WSne", "xfga1p", "ya2f1g"], ) -# Plot x-, y-values as points on the line -# Style of points is 0.2 cm circles, color fill is "green" with a "black" -# outline. Points are not clipped if they go off the figure -fig.plot(x=xvalues, y=yvalues, style="c0.2c", fill="green", no_clip=True, pen="black") + +# Set the line thickness to "thick" (equals "1p", i.e. 1 point) +# Use as color "black" (default) and as style "solid" (default) +fig.plot(x=xvalues, y=yvalues, pen="thick,black,solid") + +# Plot the data points ontop of the line +# Use circles with 0.5 centimeters diameter, with a "orange" fill and a "black" outline +# Symbols are not clipped if they go off the figure +fig.plot(x=xvalues, y=yvalues, style="c0.5c", fill="orange", pen="black", no_clip=True) fig.show() diff --git a/examples/projections/nongeo/polar.py b/examples/projections/nongeo/polar.py index d5b5d2f4fda..3fc42fe0335 100644 --- a/examples/projections/nongeo/polar.py +++ b/examples/projections/nongeo/polar.py @@ -63,9 +63,8 @@ region=[0, 360, 0, 1], # set map width to 5 cm projection="P5c", - # set the frame, color, and title - # @^ allows for a line break within the title - frame=["xa45f", "+gbisque+tprojection='P5c' @^ region=[0, 360, 0, 1]"], + # set the frame and title; @^ allows for a line break within the title + frame=["xa45f", "+tprojection='P5c' @^ region=[0, 360, 0, 1]"], ) fig.shift_origin(xshift="8c") @@ -79,9 +78,8 @@ # set map width to 5 cm and interpret input data as geographic azimuth # instead of standard angle projection="P5c+a", - # set the frame, color, and title - # @^ allows for a line break within the title - frame=["xa45f", "+gbisque+tprojection='P5c+a' @^ region=[0, 360, 0, 1]"], + # set the frame and title; @^ allows for a line break within the title + frame=["xa45f", "+tprojection='P5c+a' @^ region=[0, 360, 0, 1]"], ) fig.shift_origin(xshift="8c") @@ -95,9 +93,8 @@ # set map width to 5 cm and interpret input data as geographic azimuth # instead of standard angle projection="P5c+a", - # set the frame, color, and title - # @^ allows for a line break within the title - frame=["xa45f", "ya0.2", "WNe+gbisque+tprojection='P5c+a' @^ region=[0, 90, 0, 1]"], + # set the frame and title; @^ allows for a line break within the title + frame=["xa45f", "ya0.2", "WNe+tprojection='P5c+a' @^ region=[0, 90, 0, 1]"], ) fig.shift_origin(xshift="-16c", yshift="-7c") @@ -112,12 +109,11 @@ # instead of standard angle, rotate coordinate system counterclockwise by # 45 degrees projection="P5c+a+t45", - # set the frame, color, and title - # @^ allows for a line break within the title + # set the frame and title; @^ allows for a line break within the title frame=[ "xa30f", "ya0.2", - "WNe+gbisque+tprojection='P5c+a+t45' @^ region=[0, 90, 0, 1]", + "WNe+tprojection='P5c+a+t45' @^ region=[0, 90, 0, 1]", ], ) @@ -133,12 +129,11 @@ # instead of standard angle, rotate coordinate system counterclockwise by # 45 degrees projection="P5c+a+t45", - # set the frame, color, and title - # @^ allows for a line break within the title + # set the frame, and title; @^ allows for a line break within the title frame=[ "xa30f", "ya", - "WNse+gbisque+tprojection='P5c+a+t45' @^ region=[0, 90, 3480, 6371]", + "WNse+tprojection='P5c+a+t45' @^ region=[0, 90, 3480, 6371]", ], ) @@ -154,12 +149,11 @@ # instead of standard angle, rotate coordinate system counterclockwise by # 45 degrees, r-axis is marked as depth projection="P5c+a+t45+z", - # set the frame, color, and title - # @^ allows for a line break within the title + # set the frame, and title; @^ allows for a line break within the title frame=[ "xa30f", "ya", - "WNse+gbisque+tprojection='P5c+a+t45+\\z' @^ region=[0, 90, 3480, 6371]", + "WNse+tprojection='P5c+a+t45+\\z' @^ region=[0, 90, 3480, 6371]", ], ) From c2b533541b4b8a902bd6bcd4ebbe90586dfe1479 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Sat, 28 Sep 2024 14:41:07 +0200 Subject: [PATCH 2/6] Adjust colors --- examples/projections/conic/conic_albers.py | 4 ++-- examples/projections/conic/conic_equidistant.py | 4 ++-- examples/projections/conic/conic_lambert.py | 4 ++-- examples/projections/conic/polyconic.py | 4 ++-- examples/projections/cyl/cyl_cassini.py | 4 ++-- examples/projections/cyl/cyl_equal_area.py | 4 ++-- examples/projections/cyl/cyl_equidistant.py | 4 ++-- examples/projections/cyl/cyl_mercator.py | 4 ++-- examples/projections/cyl/cyl_miller.py | 4 ++-- examples/projections/cyl/cyl_oblique_mercator.py | 6 +++--- examples/projections/cyl/cyl_stereographic.py | 4 ++-- examples/projections/cyl/cyl_transverse_mercator.py | 4 ++-- .../projections/cyl/cyl_universal_transverse_mercator.py | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/projections/conic/conic_albers.py b/examples/projections/conic/conic_albers.py index 12398cf79fb..e3c9074a092 100644 --- a/examples/projections/conic/conic_albers.py +++ b/examples/projections/conic/conic_albers.py @@ -29,7 +29,7 @@ region="BR+R2", projection="B-55/-15/-25/0/12c", frame="afg", - land="gray", - water="dodgerblue4", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/conic/conic_equidistant.py b/examples/projections/conic/conic_equidistant.py index 757b842bffa..b528ebad31e 100644 --- a/examples/projections/conic/conic_equidistant.py +++ b/examples/projections/conic/conic_equidistant.py @@ -23,7 +23,7 @@ region=[-88, -70, 18, 24], projection="D-79/21/19/23/12c", frame="afg", - land="gray", - water="dodgerblue4", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/conic/conic_lambert.py b/examples/projections/conic/conic_lambert.py index 99746a9c1d1..3ce5256afa8 100644 --- a/examples/projections/conic/conic_lambert.py +++ b/examples/projections/conic/conic_lambert.py @@ -26,8 +26,8 @@ region=[-130, -70, 24, 52], projection="L-100/35/33/45/12c", frame="afg", - land="gray", - water="dodgerblue4", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/conic/polyconic.py b/examples/projections/conic/polyconic.py index c82d389b162..c979cb77b09 100644 --- a/examples/projections/conic/polyconic.py +++ b/examples/projections/conic/polyconic.py @@ -33,7 +33,7 @@ region=[-180, -20, 0, 90], projection="Poly/12c", frame="afg", - land="gray", - water="dodgerblue4", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_cassini.py b/examples/projections/cyl/cyl_cassini.py index 2d9f37ca3af..9155793030b 100644 --- a/examples/projections/cyl/cyl_cassini.py +++ b/examples/projections/cyl/cyl_cassini.py @@ -27,7 +27,7 @@ region="MG+R2", projection="C47/-19/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_equal_area.py b/examples/projections/cyl/cyl_equal_area.py index 5e2c9442e41..9fd6685a92f 100644 --- a/examples/projections/cyl/cyl_equal_area.py +++ b/examples/projections/cyl/cyl_equal_area.py @@ -21,7 +21,7 @@ region="d", projection="Y35/30/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_equidistant.py b/examples/projections/cyl/cyl_equidistant.py index c76508806ff..439dc998c46 100644 --- a/examples/projections/cyl/cyl_equidistant.py +++ b/examples/projections/cyl/cyl_equidistant.py @@ -25,7 +25,7 @@ region="d", projection="Q12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_mercator.py b/examples/projections/cyl/cyl_mercator.py index a62f3abfa74..fe31eec2939 100644 --- a/examples/projections/cyl/cyl_mercator.py +++ b/examples/projections/cyl/cyl_mercator.py @@ -28,7 +28,7 @@ region=[0, 360, -80, 80], projection="M0/0/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_miller.py b/examples/projections/cyl/cyl_miller.py index e0b9d6b9deb..78cf178b4d6 100644 --- a/examples/projections/cyl/cyl_miller.py +++ b/examples/projections/cyl/cyl_miller.py @@ -24,7 +24,7 @@ region=[-180, 180, -80, 80], projection="J-65/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_oblique_mercator.py b/examples/projections/cyl/cyl_oblique_mercator.py index c08dfd11881..c2806d6d19c 100644 --- a/examples/projections/cyl/cyl_oblique_mercator.py +++ b/examples/projections/cyl/cyl_oblique_mercator.py @@ -31,7 +31,7 @@ # Set bottom left and top right coordinates of the figure with "+r" region="-122/35/-107/22+r", frame="afg", - land="darkgreen", + land="seagreen", water="lightgray", ) fig.show() @@ -51,7 +51,7 @@ projection="Ob130/35/25/35/3c", region="130/35/145/40+r", frame="afg", - land="darkgreen", + land="seagreen", water="lightgray", ) fig.show() @@ -71,7 +71,7 @@ projection="Oc280/25.5/22/69/4c", region="270/20/305/25+r", frame="afg", - land="darkgreen", + land="seagreen", water="lightgray", ) fig.show() diff --git a/examples/projections/cyl/cyl_stereographic.py b/examples/projections/cyl/cyl_stereographic.py index 0e8867e8b27..55d7ce2a826 100644 --- a/examples/projections/cyl/cyl_stereographic.py +++ b/examples/projections/cyl/cyl_stereographic.py @@ -36,7 +36,7 @@ region="g", projection="Cyl_stere/30/-20/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_transverse_mercator.py b/examples/projections/cyl/cyl_transverse_mercator.py index 2c848545f56..8558d1697c1 100644 --- a/examples/projections/cyl/cyl_transverse_mercator.py +++ b/examples/projections/cyl/cyl_transverse_mercator.py @@ -24,7 +24,7 @@ region=[20, 50, 30, 45], projection="T35/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_universal_transverse_mercator.py b/examples/projections/cyl/cyl_universal_transverse_mercator.py index 1cb44dbd88a..a2c1e2e87ed 100644 --- a/examples/projections/cyl/cyl_universal_transverse_mercator.py +++ b/examples/projections/cyl/cyl_universal_transverse_mercator.py @@ -45,7 +45,7 @@ region=[127.5, 128.5, 26, 27], projection="U52R/12c", frame="afg", - land="darkgreen", - water="lightgray", + land="seagreen", + water="gray90", ) fig.show() From 9d475de012d5f8b79a6cf51bbdb8dc554398679f Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Sat, 28 Sep 2024 15:05:12 +0200 Subject: [PATCH 3/6] Adjust colors --- examples/projections/azim/azim_equidistant.py | 2 +- .../projections/azim/azim_general_perspective.py | 4 ++-- .../projections/azim/azim_general_stereographic.py | 4 ++-- examples/projections/azim/azim_gnomonic.py | 6 +++++- examples/projections/azim/azim_lambert.py | 6 +++++- examples/projections/azim/azim_orthographic.py | 6 +++++- examples/projections/conic/conic_albers.py | 4 ++-- examples/projections/conic/conic_equidistant.py | 4 ++-- examples/projections/conic/conic_lambert.py | 4 ++-- examples/projections/conic/polyconic.py | 4 ++-- examples/projections/cyl/cyl_cassini.py | 4 ++-- examples/projections/cyl/cyl_equal_area.py | 4 ++-- examples/projections/cyl/cyl_equidistant.py | 4 ++-- examples/projections/cyl/cyl_mercator.py | 4 ++-- examples/projections/cyl/cyl_miller.py | 4 ++-- examples/projections/cyl/cyl_oblique_mercator.py | 4 ++-- examples/projections/cyl/cyl_stereographic.py | 4 ++-- examples/projections/cyl/cyl_transverse_mercator.py | 4 ++-- .../cyl/cyl_universal_transverse_mercator.py | 4 ++-- examples/projections/nongeo/cartesian_linear.py | 4 +++- examples/projections/nongeo/cartesian_logarithmic.py | 4 ++-- examples/projections/nongeo/cartesian_power.py | 2 +- examples/projections/nongeo/polar.py | 12 ++++++------ 23 files changed, 58 insertions(+), 44 deletions(-) diff --git a/examples/projections/azim/azim_equidistant.py b/examples/projections/azim/azim_equidistant.py index 55dfeb43e4d..1e8bb682234 100644 --- a/examples/projections/azim/azim_equidistant.py +++ b/examples/projections/azim/azim_equidistant.py @@ -23,6 +23,6 @@ fig = pygmt.Figure() fig.coast( - region="g", projection="E-100/40/15c", frame="afg", land="gray", water="cornsilk" + region="g", projection="E-100/40/15c", frame="afg", land="khaki", water="white" ) fig.show() diff --git a/examples/projections/azim/azim_general_perspective.py b/examples/projections/azim/azim_general_perspective.py index d3bb1a34b9f..e0d3933b5d8 100644 --- a/examples/projections/azim/azim_general_perspective.py +++ b/examples/projections/azim/azim_general_perspective.py @@ -36,7 +36,7 @@ region="g", projection="G4/52/12c+a30+t45+v60/60+w0+z250", frame="afg", - land="gray", - water="cornsilk", + land="khaki", + water="white", ) fig.show() diff --git a/examples/projections/azim/azim_general_stereographic.py b/examples/projections/azim/azim_general_stereographic.py index a313cca9b00..5c001429289 100644 --- a/examples/projections/azim/azim_general_stereographic.py +++ b/examples/projections/azim/azim_general_stereographic.py @@ -26,7 +26,7 @@ region=[4, 14, 52, 57], projection="S0/90/12c", frame="afg", - land="gray", - water="cornsilk", + land="khaki", + water="white", ) fig.show() diff --git a/examples/projections/azim/azim_gnomonic.py b/examples/projections/azim/azim_gnomonic.py index 03076803896..e89c106240d 100644 --- a/examples/projections/azim/azim_gnomonic.py +++ b/examples/projections/azim/azim_gnomonic.py @@ -24,6 +24,10 @@ fig = pygmt.Figure() fig.coast( - region="g", projection="F-90/15/12c", frame="afg", land="gray", water="cornsilk" + region="g", + projection="F-90/15/12c", + frame="afg", + land="khaki", + water="white", ) fig.show() diff --git a/examples/projections/azim/azim_lambert.py b/examples/projections/azim/azim_lambert.py index 23dff45fada..3d797ecf31f 100644 --- a/examples/projections/azim/azim_lambert.py +++ b/examples/projections/azim/azim_lambert.py @@ -21,6 +21,10 @@ fig = pygmt.Figure() fig.coast( - region="g", projection="A30/-20/60/12c", frame="afg", land="gray", water="cornsilk" + region="g", + projection="A30/-20/60/12c", + frame="afg", + land="khaki", + water="white", ) fig.show() diff --git a/examples/projections/azim/azim_orthographic.py b/examples/projections/azim/azim_orthographic.py index 58ffa01a3da..1986d31221a 100644 --- a/examples/projections/azim/azim_orthographic.py +++ b/examples/projections/azim/azim_orthographic.py @@ -22,6 +22,10 @@ fig = pygmt.Figure() fig.coast( - region="g", projection="G10/52/12c", frame="afg", land="gray", water="cornsilk" + region="g", + projection="G10/52/12c", + frame="afg", + land="khaki", + water="white", ) fig.show() diff --git a/examples/projections/conic/conic_albers.py b/examples/projections/conic/conic_albers.py index e3c9074a092..bad5f03e380 100644 --- a/examples/projections/conic/conic_albers.py +++ b/examples/projections/conic/conic_albers.py @@ -29,7 +29,7 @@ region="BR+R2", projection="B-55/-15/-25/0/12c", frame="afg", - land="gray80", - water="70/130/180", # steelblue + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/conic/conic_equidistant.py b/examples/projections/conic/conic_equidistant.py index b528ebad31e..55769d4b9c4 100644 --- a/examples/projections/conic/conic_equidistant.py +++ b/examples/projections/conic/conic_equidistant.py @@ -23,7 +23,7 @@ region=[-88, -70, 18, 24], projection="D-79/21/19/23/12c", frame="afg", - land="gray80", - water="70/130/180", # steelblue + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/conic/conic_lambert.py b/examples/projections/conic/conic_lambert.py index 3ce5256afa8..e616a927598 100644 --- a/examples/projections/conic/conic_lambert.py +++ b/examples/projections/conic/conic_lambert.py @@ -26,8 +26,8 @@ region=[-130, -70, 24, 52], projection="L-100/35/33/45/12c", frame="afg", - land="gray80", - water="70/130/180", # steelblue + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/conic/polyconic.py b/examples/projections/conic/polyconic.py index c979cb77b09..4d6b19b76f9 100644 --- a/examples/projections/conic/polyconic.py +++ b/examples/projections/conic/polyconic.py @@ -33,7 +33,7 @@ region=[-180, -20, 0, 90], projection="Poly/12c", frame="afg", - land="gray80", - water="70/130/180", # steelblue + land="seagreen", + water="gray90", ) fig.show() diff --git a/examples/projections/cyl/cyl_cassini.py b/examples/projections/cyl/cyl_cassini.py index 9155793030b..d017c3c2411 100644 --- a/examples/projections/cyl/cyl_cassini.py +++ b/examples/projections/cyl/cyl_cassini.py @@ -27,7 +27,7 @@ region="MG+R2", projection="C47/-19/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_equal_area.py b/examples/projections/cyl/cyl_equal_area.py index 9fd6685a92f..22233a4ba1d 100644 --- a/examples/projections/cyl/cyl_equal_area.py +++ b/examples/projections/cyl/cyl_equal_area.py @@ -21,7 +21,7 @@ region="d", projection="Y35/30/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_equidistant.py b/examples/projections/cyl/cyl_equidistant.py index 439dc998c46..aae8b419064 100644 --- a/examples/projections/cyl/cyl_equidistant.py +++ b/examples/projections/cyl/cyl_equidistant.py @@ -25,7 +25,7 @@ region="d", projection="Q12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_mercator.py b/examples/projections/cyl/cyl_mercator.py index fe31eec2939..82c652b5888 100644 --- a/examples/projections/cyl/cyl_mercator.py +++ b/examples/projections/cyl/cyl_mercator.py @@ -28,7 +28,7 @@ region=[0, 360, -80, 80], projection="M0/0/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_miller.py b/examples/projections/cyl/cyl_miller.py index 78cf178b4d6..88c2ec9025b 100644 --- a/examples/projections/cyl/cyl_miller.py +++ b/examples/projections/cyl/cyl_miller.py @@ -24,7 +24,7 @@ region=[-180, 180, -80, 80], projection="J-65/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_oblique_mercator.py b/examples/projections/cyl/cyl_oblique_mercator.py index c2806d6d19c..aa981329342 100644 --- a/examples/projections/cyl/cyl_oblique_mercator.py +++ b/examples/projections/cyl/cyl_oblique_mercator.py @@ -71,8 +71,8 @@ projection="Oc280/25.5/22/69/4c", region="270/20/305/25+r", frame="afg", - land="seagreen", - water="lightgray", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_stereographic.py b/examples/projections/cyl/cyl_stereographic.py index 55d7ce2a826..d39fb060c2f 100644 --- a/examples/projections/cyl/cyl_stereographic.py +++ b/examples/projections/cyl/cyl_stereographic.py @@ -36,7 +36,7 @@ region="g", projection="Cyl_stere/30/-20/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_transverse_mercator.py b/examples/projections/cyl/cyl_transverse_mercator.py index 8558d1697c1..cc1a71041ee 100644 --- a/examples/projections/cyl/cyl_transverse_mercator.py +++ b/examples/projections/cyl/cyl_transverse_mercator.py @@ -24,7 +24,7 @@ region=[20, 50, 30, 45], projection="T35/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/cyl/cyl_universal_transverse_mercator.py b/examples/projections/cyl/cyl_universal_transverse_mercator.py index a2c1e2e87ed..9d32f2a2891 100644 --- a/examples/projections/cyl/cyl_universal_transverse_mercator.py +++ b/examples/projections/cyl/cyl_universal_transverse_mercator.py @@ -45,7 +45,7 @@ region=[127.5, 128.5, 26, 27], projection="U52R/12c", frame="afg", - land="seagreen", - water="gray90", + land="gray80", + water="70/130/180", # steelblue ) fig.show() diff --git a/examples/projections/nongeo/cartesian_linear.py b/examples/projections/nongeo/cartesian_linear.py index 134ecd079e9..6158aa078ad 100644 --- a/examples/projections/nongeo/cartesian_linear.py +++ b/examples/projections/nongeo/cartesian_linear.py @@ -24,7 +24,9 @@ fig = pygmt.Figure() # The region parameter is specified as x_min, x_max, y_min, y_max -fig.basemap(region=[0, 10, 0, 50], projection="X15c/10c", frame="afg") +fig.basemap(region=[0, 10, 0, 50], projection="X15c/10c", frame=["afg", "+gbisque"]) fig.plot(x=[3, 9, 2], y=[4, 9, 37], pen="2p,black") +# Plot data points ontop of the line +# Use squares with a size of 0.5 centimeters, a "orange" fill and a "black" outline fig.plot(x=[3, 9, 2], y=[4, 9, 37], style="s0.5c", fill="orange", pen="black") fig.show() diff --git a/examples/projections/nongeo/cartesian_logarithmic.py b/examples/projections/nongeo/cartesian_logarithmic.py index 9e7feaedf13..dc670dfdfed 100644 --- a/examples/projections/nongeo/cartesian_logarithmic.py +++ b/examples/projections/nongeo/cartesian_logarithmic.py @@ -32,14 +32,14 @@ projection="X15cl/10c", # Set the figures frame and color as well as # annotations, ticks, and gridlines - frame=["WSne", "xa2g3", "ya2f1g2"], + frame=["WSne+gbisque", "xa2g3", "ya2f1g2"], ) # Set the line thickness to "2p", the color to "black", and the style to "dashed" fig.plot(x=xline, y=yline, pen="2p,black,dashed") # Plot the square root values ontop of the line -# Use circles with a diameter of 0.5 centimeters, a "orange" fill and a "black" outline +# Use squares with a size of 0.5 centimeters, a "orange" fill and a "black" outline # Symbols are not clipped if they go off the figure fig.plot(x=xpoints, y=ypoints, style="s0.5c", fill="orange", pen="black", no_clip=True) fig.show() diff --git a/examples/projections/nongeo/cartesian_power.py b/examples/projections/nongeo/cartesian_power.py index e3d8fca00e5..cce70733611 100644 --- a/examples/projections/nongeo/cartesian_power.py +++ b/examples/projections/nongeo/cartesian_power.py @@ -28,7 +28,7 @@ projection="X15cp0.5/10c", # Set the figures frame as well as annotations and ticks # The "p" forces to show only square numbers as annotations of the x-axis - frame=["WSne", "xfga1p", "ya2f1g"], + frame=["WSne+gbisque", "xfga1p", "ya2f1g"], ) # Set the line thickness to "thick" (equals "1p", i.e. 1 point) diff --git a/examples/projections/nongeo/polar.py b/examples/projections/nongeo/polar.py index 3fc42fe0335..cbac5567f7f 100644 --- a/examples/projections/nongeo/polar.py +++ b/examples/projections/nongeo/polar.py @@ -64,7 +64,7 @@ # set map width to 5 cm projection="P5c", # set the frame and title; @^ allows for a line break within the title - frame=["xa45f", "+tprojection='P5c' @^ region=[0, 360, 0, 1]"], + frame=["xa45f", "+gbisque+tprojection='P5c' @^ region=[0, 360, 0, 1]"], ) fig.shift_origin(xshift="8c") @@ -79,7 +79,7 @@ # instead of standard angle projection="P5c+a", # set the frame and title; @^ allows for a line break within the title - frame=["xa45f", "+tprojection='P5c+a' @^ region=[0, 360, 0, 1]"], + frame=["xa45f", "+gbisque+tprojection='P5c+a' @^ region=[0, 360, 0, 1]"], ) fig.shift_origin(xshift="8c") @@ -94,7 +94,7 @@ # instead of standard angle projection="P5c+a", # set the frame and title; @^ allows for a line break within the title - frame=["xa45f", "ya0.2", "WNe+tprojection='P5c+a' @^ region=[0, 90, 0, 1]"], + frame=["xa45f", "ya0.2", "WNe+gbisque+tprojection='P5c+a' @^ region=[0, 90, 0, 1]"], ) fig.shift_origin(xshift="-16c", yshift="-7c") @@ -113,7 +113,7 @@ frame=[ "xa30f", "ya0.2", - "WNe+tprojection='P5c+a+t45' @^ region=[0, 90, 0, 1]", + "WNe+gbisque+tprojection='P5c+a+t45' @^ region=[0, 90, 0, 1]", ], ) @@ -133,7 +133,7 @@ frame=[ "xa30f", "ya", - "WNse+tprojection='P5c+a+t45' @^ region=[0, 90, 3480, 6371]", + "WNse+gbisque+tprojection='P5c+a+t45' @^ region=[0, 90, 3480, 6371]", ], ) @@ -153,7 +153,7 @@ frame=[ "xa30f", "ya", - "WNse+tprojection='P5c+a+t45+\\z' @^ region=[0, 90, 3480, 6371]", + "WNse+gbisque+tprojection='P5c+a+t45+\\z' @^ region=[0, 90, 3480, 6371]", ], ) From 2d1acca4abc97a6d187903e6c31abfb46aaf3ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Sat, 28 Sep 2024 17:51:59 +0200 Subject: [PATCH 4/6] Fix typo Co-authored-by: Dongdong Tian --- examples/projections/nongeo/cartesian_linear.py | 2 +- examples/projections/nongeo/cartesian_logarithmic.py | 2 +- examples/projections/nongeo/cartesian_power.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/projections/nongeo/cartesian_linear.py b/examples/projections/nongeo/cartesian_linear.py index 6158aa078ad..2bf057d9437 100644 --- a/examples/projections/nongeo/cartesian_linear.py +++ b/examples/projections/nongeo/cartesian_linear.py @@ -27,6 +27,6 @@ fig.basemap(region=[0, 10, 0, 50], projection="X15c/10c", frame=["afg", "+gbisque"]) fig.plot(x=[3, 9, 2], y=[4, 9, 37], pen="2p,black") # Plot data points ontop of the line -# Use squares with a size of 0.5 centimeters, a "orange" fill and a "black" outline +# Use squares with a size of 0.5 centimeters, an "orange" fill and a "black" outline fig.plot(x=[3, 9, 2], y=[4, 9, 37], style="s0.5c", fill="orange", pen="black") fig.show() diff --git a/examples/projections/nongeo/cartesian_logarithmic.py b/examples/projections/nongeo/cartesian_logarithmic.py index dc670dfdfed..739dcb80742 100644 --- a/examples/projections/nongeo/cartesian_logarithmic.py +++ b/examples/projections/nongeo/cartesian_logarithmic.py @@ -39,7 +39,7 @@ fig.plot(x=xline, y=yline, pen="2p,black,dashed") # Plot the square root values ontop of the line -# Use squares with a size of 0.5 centimeters, a "orange" fill and a "black" outline +# Use squares with a size of 0.5 centimeters, an "orange" fill and a "black" outline # Symbols are not clipped if they go off the figure fig.plot(x=xpoints, y=ypoints, style="s0.5c", fill="orange", pen="black", no_clip=True) fig.show() diff --git a/examples/projections/nongeo/cartesian_power.py b/examples/projections/nongeo/cartesian_power.py index cce70733611..f1f37f88593 100644 --- a/examples/projections/nongeo/cartesian_power.py +++ b/examples/projections/nongeo/cartesian_power.py @@ -36,7 +36,7 @@ fig.plot(x=xvalues, y=yvalues, pen="thick,black,solid") # Plot the data points ontop of the line -# Use circles with 0.5 centimeters diameter, with a "orange" fill and a "black" outline +# Use circles with 0.5 centimeters diameter, with an "orange" fill and a "black" outline # Symbols are not clipped if they go off the figure fig.plot(x=xvalues, y=yvalues, style="c0.5c", fill="orange", pen="black", no_clip=True) fig.show() From c99c49e94b31414fa4adbeffa0e85181bf458f69 Mon Sep 17 00:00:00 2001 From: yvonnefroelich Date: Sat, 28 Sep 2024 18:32:19 +0200 Subject: [PATCH 5/6] Adjust colornames --- examples/projections/cyl/cyl_cassini.py | 2 +- examples/projections/cyl/cyl_equal_area.py | 2 +- examples/projections/cyl/cyl_equidistant.py | 2 +- examples/projections/cyl/cyl_mercator.py | 2 +- examples/projections/cyl/cyl_miller.py | 2 +- examples/projections/cyl/cyl_oblique_mercator.py | 10 +++++----- examples/projections/cyl/cyl_stereographic.py | 2 +- examples/projections/cyl/cyl_transverse_mercator.py | 2 +- .../cyl/cyl_universal_transverse_mercator.py | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/projections/cyl/cyl_cassini.py b/examples/projections/cyl/cyl_cassini.py index d017c3c2411..140911b4b0e 100644 --- a/examples/projections/cyl/cyl_cassini.py +++ b/examples/projections/cyl/cyl_cassini.py @@ -28,6 +28,6 @@ projection="C47/-19/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_equal_area.py b/examples/projections/cyl/cyl_equal_area.py index 22233a4ba1d..ee0efd6b012 100644 --- a/examples/projections/cyl/cyl_equal_area.py +++ b/examples/projections/cyl/cyl_equal_area.py @@ -22,6 +22,6 @@ projection="Y35/30/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_equidistant.py b/examples/projections/cyl/cyl_equidistant.py index aae8b419064..7cdc239f852 100644 --- a/examples/projections/cyl/cyl_equidistant.py +++ b/examples/projections/cyl/cyl_equidistant.py @@ -26,6 +26,6 @@ projection="Q12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_mercator.py b/examples/projections/cyl/cyl_mercator.py index 82c652b5888..124af3b1ce2 100644 --- a/examples/projections/cyl/cyl_mercator.py +++ b/examples/projections/cyl/cyl_mercator.py @@ -29,6 +29,6 @@ projection="M0/0/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_miller.py b/examples/projections/cyl/cyl_miller.py index 88c2ec9025b..ab791b5fc8e 100644 --- a/examples/projections/cyl/cyl_miller.py +++ b/examples/projections/cyl/cyl_miller.py @@ -25,6 +25,6 @@ projection="J-65/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_oblique_mercator.py b/examples/projections/cyl/cyl_oblique_mercator.py index aa981329342..17bf589d48b 100644 --- a/examples/projections/cyl/cyl_oblique_mercator.py +++ b/examples/projections/cyl/cyl_oblique_mercator.py @@ -31,8 +31,8 @@ # Set bottom left and top right coordinates of the figure with "+r" region="-122/35/-107/22+r", frame="afg", - land="seagreen", - water="lightgray", + land="gray80", + water="steelblue", ) fig.show() @@ -51,8 +51,8 @@ projection="Ob130/35/25/35/3c", region="130/35/145/40+r", frame="afg", - land="seagreen", - water="lightgray", + land="gray80", + water="steelblue", ) fig.show() @@ -72,7 +72,7 @@ region="270/20/305/25+r", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_stereographic.py b/examples/projections/cyl/cyl_stereographic.py index d39fb060c2f..d1abd1bff52 100644 --- a/examples/projections/cyl/cyl_stereographic.py +++ b/examples/projections/cyl/cyl_stereographic.py @@ -37,6 +37,6 @@ projection="Cyl_stere/30/-20/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_transverse_mercator.py b/examples/projections/cyl/cyl_transverse_mercator.py index cc1a71041ee..d904df283f8 100644 --- a/examples/projections/cyl/cyl_transverse_mercator.py +++ b/examples/projections/cyl/cyl_transverse_mercator.py @@ -25,6 +25,6 @@ projection="T35/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() diff --git a/examples/projections/cyl/cyl_universal_transverse_mercator.py b/examples/projections/cyl/cyl_universal_transverse_mercator.py index 9d32f2a2891..51a296451bf 100644 --- a/examples/projections/cyl/cyl_universal_transverse_mercator.py +++ b/examples/projections/cyl/cyl_universal_transverse_mercator.py @@ -46,6 +46,6 @@ projection="U52R/12c", frame="afg", land="gray80", - water="70/130/180", # steelblue + water="steelblue", ) fig.show() From 820e9a9e59517535bbeb8899c61379a03d3d125b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvonne=20Fr=C3=B6hlich?= <94163266+yvonnefroehlich@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:18:52 +0200 Subject: [PATCH 6/6] Adjust size of symobls --- examples/projections/nongeo/cartesian_linear.py | 4 ++-- examples/projections/nongeo/cartesian_logarithmic.py | 4 ++-- examples/projections/nongeo/cartesian_power.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/projections/nongeo/cartesian_linear.py b/examples/projections/nongeo/cartesian_linear.py index 2bf057d9437..c08c6ecf5c4 100644 --- a/examples/projections/nongeo/cartesian_linear.py +++ b/examples/projections/nongeo/cartesian_linear.py @@ -27,6 +27,6 @@ fig.basemap(region=[0, 10, 0, 50], projection="X15c/10c", frame=["afg", "+gbisque"]) fig.plot(x=[3, 9, 2], y=[4, 9, 37], pen="2p,black") # Plot data points ontop of the line -# Use squares with a size of 0.5 centimeters, an "orange" fill and a "black" outline -fig.plot(x=[3, 9, 2], y=[4, 9, 37], style="s0.5c", fill="orange", pen="black") +# Use squares with a size of 0.3 centimeters, an "orange" fill and a "black" outline +fig.plot(x=[3, 9, 2], y=[4, 9, 37], style="s0.3c", fill="orange", pen="black") fig.show() diff --git a/examples/projections/nongeo/cartesian_logarithmic.py b/examples/projections/nongeo/cartesian_logarithmic.py index 739dcb80742..3a4ab6f10e2 100644 --- a/examples/projections/nongeo/cartesian_logarithmic.py +++ b/examples/projections/nongeo/cartesian_logarithmic.py @@ -39,7 +39,7 @@ fig.plot(x=xline, y=yline, pen="2p,black,dashed") # Plot the square root values ontop of the line -# Use squares with a size of 0.5 centimeters, an "orange" fill and a "black" outline +# Use squares with a size of 0.3 centimeters, an "orange" fill and a "black" outline # Symbols are not clipped if they go off the figure -fig.plot(x=xpoints, y=ypoints, style="s0.5c", fill="orange", pen="black", no_clip=True) +fig.plot(x=xpoints, y=ypoints, style="s0.3c", fill="orange", pen="black", no_clip=True) fig.show() diff --git a/examples/projections/nongeo/cartesian_power.py b/examples/projections/nongeo/cartesian_power.py index f1f37f88593..761011bce67 100644 --- a/examples/projections/nongeo/cartesian_power.py +++ b/examples/projections/nongeo/cartesian_power.py @@ -36,7 +36,7 @@ fig.plot(x=xvalues, y=yvalues, pen="thick,black,solid") # Plot the data points ontop of the line -# Use circles with 0.5 centimeters diameter, with an "orange" fill and a "black" outline +# Use circles with 0.3 centimeters diameter, with an "orange" fill and a "black" outline # Symbols are not clipped if they go off the figure -fig.plot(x=xvalues, y=yvalues, style="c0.5c", fill="orange", pen="black", no_clip=True) +fig.plot(x=xvalues, y=yvalues, style="c0.3c", fill="orange", pen="black", no_clip=True) fig.show()