Merge branch 'main' into datatypes/gmtcube

.github/ISSUE_TEMPLATE/1-bug_report.yaml

@@ -23,7 +23,7 @@ body:
         For more details, check out:
 
         - [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
-        - [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
+        - [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
 
       placeholder: "PASTE CODE HERE"
       render: python

AUTHORS.md

@@ -13,16 +13,16 @@ The following people have contributed code and/or documentation to the project
 | [Abhishek Anant](https://twitter.com/itsabhianant) | [0000-0002-5751-2010](https://orcid.org/0000-0002-5751-2010) | Unaffiliated |
 | [Andre L. Belem](https://github.com/andrebelem) | [0000-0002-8865-6180](https://orcid.org/0000-0002-8865-6180) | Fluminense Federal University, Brazil |
 | [Dongdong Tian](https://seisman.info/) | [0000-0001-7967-1197](https://orcid.org/0000-0001-7967-1197) | China University of Geosciences, China |
-| [Jamie Quinn](http://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom |
+| [Jamie Quinn](https://jamiejquinn.com) | [0000-0002-0268-7032](https://orcid.org/0000-0002-0268-7032) | University College London, United Kingdom |
 | [Jiayuan Yao](https://github.com/core-man) | [0000-0001-7036-4238](https://orcid.org/0000-0001-7036-4238) | Nanyang Technological University, Singapore |
 | [Jing-Hui Tong](https://github.com/jhtong33) | [0009-0002-7195-3071](https://orcid.org/0009-0002-7195-3071) | National Taiwan Normal University, Taiwan |
 | [Kathryn Materna](https://github.com/kmaterna) | [0000-0002-6687-980X](https://orcid.org/0000-0002-6687-980X) | US Geological Survey, USA |
-| [Leonardo Uieda](http://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom |
+| [Leonardo Uieda](https://www.leouieda.com/) | [0000-0001-6123-9515](https://orcid.org/0000-0001-6123-9515) | University of Liverpool, United Kingdom |
 | [Liam Toney](https://liam.earth/) | [0000-0003-0167-9433](https://orcid.org/0000-0003-0167-9433) | University of Alaska Fairbanks, USA |
 | [Malte Ziebarth](https://github.com/mjziebarth) | [0000-0002-5190-4478](https://orcid.org/0000-0002-5190-4478) | GFZ German Research Centre for Geosciences, Germany |
 | [Max Jones](https://github.com/maxrjones) | [0000-0003-0180-8928](https://orcid.org/0000-0003-0180-8928) | University of Hawaiʻi at Mānoa, USA |
 | [Michael Grund](https://github.com/michaelgrund) | [0000-0001-8759-2018](https://orcid.org/0000-0001-8759-2018) | SNP Innovation Lab GmbH, Germany |
-| [Tyler Newton](http://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA |
+| [Tyler Newton](https://www.tnewton.com/) | [0000-0002-1560-6553](https://orcid.org/0000-0002-1560-6553) | University of Oregon, USA |
 | [Wei Ji Leong](https://github.com/weiji14) | [0000-0003-2354-1988](https://orcid.org/0000-0003-2354-1988) | Development Seed, USA |
 | [William Schlitzer](https://github.com/willschlitzer) | [0000-0002-5843-2282](https://orcid.org/0000-0002-5843-2282) | Unaffiliated |
 | [Yohai Magen](https://github.com/yohaimagen) | [0000-0002-4892-4013](https://orcid.org/0000-0002-4892-4013) | Tel Aviv University, Israel |

README.md

@@ -4,7 +4,7 @@
 
 [Documentation (development version)](https://www.pygmt.org/dev) | [Contact](https://forum.generic-mapping-tools.org) | [TryOnline](https://github.com/GenericMappingTools/try-gmt)
 
-[![Latest version on PyPI](http://img.shields.io/pypi/v/pygmt.svg?style=flat-square)](https://pypi.python.org/pypi/pygmt)
+[![Latest version on PyPI](https://img.shields.io/pypi/v/pygmt.svg?style=flat-square)](https://pypi.python.org/pypi/pygmt)
 [![Latest version on conda-forge](https://img.shields.io/conda/v/conda-forge/pygmt?style=flat-square)](https://anaconda.org/conda-forge/pygmt)
 [![GitHub Actions Tests status](https://github.com/GenericMappingTools/pygmt/workflows/Tests/badge.svg)](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests.yaml)
 [![GitHub Actions GMT Dev Tests status](https://github.com/GenericMappingTools/pygmt/workflows/GMT%20Dev%20Tests/badge.svg)](https://github.com/GenericMappingTools/pygmt/actions/workflows/ci_tests_dev.yaml)

doc/_static/version_switch.js

@@ -74,7 +74,7 @@
            window.location.href = new_url;
         },
         error: function() {
-            window.location.href = 'http://' + doc_url + '/' + selected;
+            window.location.href = 'https://' + doc_url + '/' + selected;
         }
       });
     }

doc/_templates/footer.html

@@ -3,7 +3,7 @@
 
 {%- block extrafooter %}
 <p>
-Built with <a href="http://sphinx-doc.org/">Sphinx</a>
+Built with <a href="https://sphinx-doc.org/">Sphinx</a>
 using a <a href="https://github.com/rtfd/sphinx_rtd_theme">theme</a>
 provided by <a href="https://readthedocs.org">Read the Docs</a>
 </p>

doc/api/index.rst

@@ -218,6 +218,8 @@ and store them in GMT's user data directory.
     :toctree: generated
 
     datasets.list_sample_data
+    datasets.load_black_marble
+    datasets.load_blue_marble
     datasets.load_earth_age
     datasets.load_earth_free_air_anomaly
     datasets.load_earth_geoid

doc/changes.md

@@ -242,7 +242,7 @@
 * Switch away from Stamen basemaps ([#2717](https://github.com/GenericMappingTools/pygmt/pull/2717))
 * Add the "validate_output_table_type" function to check the "output_type" parameter ([#2772](https://github.com/GenericMappingTools/pygmt/pull/2772))
 * Create "skip_if_no" helper function to skip tests when missing a package ([#2883](https://github.com/GenericMappingTools/pygmt/pull/2883))
-* Fix "fixture_xr_image" to open "earth_day_01d_p" directly with rioxarray ([#2963](https://github.com/GenericMappingTools/pygmt/pull/2963))
+* Fix "fixture_xr_image" to open "earth_day_01d" directly with rioxarray ([#2963](https://github.com/GenericMappingTools/pygmt/pull/2963))
 * Improve the way to import optional modules ([#2809](https://github.com/GenericMappingTools/pygmt/pull/2809))
 * Move variable `__gmt_version__` to pygmt.clib to avoid cyclic-import errors ([#2713](https://github.com/GenericMappingTools/pygmt/pull/2713))
 * Refactor the internal "_load_remote_dataset function" to simplify datasets' definitions ([#2917](https://github.com/GenericMappingTools/pygmt/pull/2917))

doc/contributing.md

@@ -100,7 +100,7 @@ Please take a look at these resources to learn about Git and pull requests (don'
 hesitate to [ask questions](contributing.md#getting-help)):
 
 * [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/).
-* [Git Workflow Tutorial](http://www.asmeurer.com/git-workflow/) by Aaron Meurer.
+* [Git Workflow Tutorial](https://www.asmeurer.com/git-workflow/) by Aaron Meurer.
 * [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).
 
 ### Getting Help
@@ -111,7 +111,7 @@ the project where you can ask questions.
 
 ### Pull Request Workflow
 
-We follow the [git pull request workflow](http://www.asmeurer.com/git-workflow)
+We follow the [git pull request workflow](https://www.asmeurer.com/git-workflow)
 to make changes to our codebase. Every change made goes through a pull request, even
 our own, so that our
 [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration)
@@ -168,7 +168,7 @@ To increase the chances of getting your pull request accepted quickly, try to:
     or [Tutorials](contributing.md#contributing-tutorials).
 * Have a good coding style
   - Use readable code, as it is better than clever code (even with comments).
-  - Follow the [PEP8](http://pep8.org) style guide for code and the
+  - Follow the [PEP8](https://pep8.org) style guide for code and the
     [NumPy style guide](https://numpydoc.readthedocs.io/en/latest/format.html)
     for docstrings. Please refer to [Code style](contributing.md#code-style).
 
@@ -251,7 +251,7 @@ There are four main components to PyGMT's documentation:
 
 The documentation is written primarily in
 [reStructuredText](https://docutils.sourceforge.io/rst.html) and built by
-[Sphinx](http://www.sphinx-doc.org/). Please refer to
+[Sphinx](https://www.sphinx-doc.org/). Please refer to
 {gmt-docs}`reStructuredText Cheatsheet <devdocs/rst-cheatsheet.html>`
 if you are new to reStructuredText. When contributing documentation, be sure to
 follow the general guidelines in the [pull request workflow](contributing.md#pull-request-workflow)
@@ -473,7 +473,7 @@ code, be sure to follow the general guidelines in the
 ### Code Style
 
 We use the [ruff](https://docs.astral.sh/ruff) tool to format the code, so we
-don't have to think about it. It loosely follow the [PEP8](http://pep8.org) guide
+don't have to think about it. It loosely follow the [PEP8](https://pep8.org) guide
 but with a few differences. Regardless, you won't have to worry about formatting
 the code yourself. Before committing, run it to automatically format your code:
 

doc/overview.md

@@ -18,8 +18,8 @@ and JPG for use on the web and elsewhere. In fact, PyGMT users will usually not
 contact with the original PostScript files and get only the more convenient formats like
 PDF and PNG.
 
-The project was started in 2017 by [Leonardo Uieda](http://www.leouieda.com) and
-[Paul Wessel](http://www.soest.hawaii.edu/wessel) (the co-creator and main developer of
+The project was started in 2017 by [Leonardo Uieda](https://www.leouieda.com) and
+[Paul Wessel](https://www.soest.hawaii.edu/wessel) (the co-creator and main developer of
 GMT) at the University of Hawaiʻi at Mānoa. The development of PyGMT has been supported
 by NSF grants [OCE-1558403](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1558403)
 and [EAR-1948602](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1948602).

examples/gallery/lines/roads.py

@@ -17,7 +17,7 @@
 
 # Read shapefile data using geopandas
 gdf = gpd.read_file(
-    "http://www2.census.gov/geo/tiger/TIGER2015/PRISECROADS/tl_2015_15_prisecroads.zip"
+    "https://www2.census.gov/geo/tiger/TIGER2015/PRISECROADS/tl_2015_15_prisecroads.zip"
 )
 # The dataset contains different road types listed in the RTTYP column,
 # here we select the following ones to plot:

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="khaki", water="white"
+)
 fig.show()

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"],
-    land="gray",
+    projection="G4/52/12c+a30+t45+v60/60+w0+z250",
+    frame="afg",
+    land="khaki",
+    water="white",
 )
 fig.show()

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="khaki",
+    water="white",
+)
 fig.show()

examples/projections/azim/azim_gnomonic.py

@@ -23,5 +23,11 @@
 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="khaki",
+    water="white",
+)
 fig.show()

examples/projections/azim/azim_lambert.py

@@ -20,5 +20,11 @@
 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="khaki",
+    water="white",
+)
 fig.show()

examples/projections/azim/azim_orthographic.py

@@ -21,5 +21,11 @@
 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="khaki",
+    water="white",
+)
 fig.show()

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="seagreen",
+    water="gray90",
 )
 fig.show()

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="seagreen",
+    water="gray90",
 )
 fig.show()

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="seagreen",
+    water="gray90",
 )
 
 fig.show()

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",
-    land="gray",
-    borders="1/thick,black",
-    frame="afg10",
+    frame="afg",
+    land="seagreen",
+    water="gray90",
 )
-
 fig.show()

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="gray80",
+    water="steelblue",
+)
 fig.show()

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="gray80",
+    water="steelblue",
 )
 fig.show()

examples/projections/cyl/cyl_equidistant.py

@@ -24,8 +24,8 @@
 fig.coast(
     region="d",
     projection="Q12c",
-    land="tan4",
-    water="lightcyan",
     frame="afg",
+    land="gray80",
+    water="steelblue",
 )
 fig.show()

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="gray80",
+    water="steelblue",
+)
 fig.show()

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="gray80",
+    water="steelblue",
 )
 fig.show()

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="gray80",
+    water="steelblue",
 )
 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="gray80",
+    water="steelblue",
 )
 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="gray80",
+    water="steelblue",
 )
 fig.show()
 

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="gray80",
+    water="steelblue",
+)
 fig.show()

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="gray80",
+    water="steelblue",
 )
 fig.show()