From 1a463cfbb11ce20219d280345ac17651d601cbf4 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 07:31:38 +0000 Subject: [PATCH 01/22] Add paint_country alias for coast() in base_plotting.py --- pygmt/base_plotting.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 1729ee4d0a5..21e3d63b129 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -62,6 +62,7 @@ def _preprocess(self, **kwargs): # pylint: disable=no-self-use A="area_thresh", B="frame", D="resolution", + E="paint_country", I="rivers", L="map_scale", N="borders", From 169cc107e33666dd3ea8ba37bb1f1d107939e6c4 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 07:48:23 +0000 Subject: [PATCH 02/22] Add explanation for paint_country --- pygmt/base_plotting.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 21e3d63b129..68f04936406 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -136,6 +136,16 @@ def coast(self, **kwargs): shorelines : str ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. + paint_country : str or list + ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` + Select painting or dumping country polygons from the Digital Chart of the + World. Append one or more comma-separated countries using the 2-character + ISO 3166-1 alpha-2 convention. To select a state of a country + (if available), append .state, (e.g, US.TX for Texas). To specify a whole + continent, prepend = to any of the continent codes (e.g. =EU for Europe). + Append **+p**pen to draw polygon outlines (default is no outline) + and **+g**fill to fill them (default is no fill). To apply different + settings to different countries, pass a list of string arguments. {XY} {p} {t} From c6aed0c6e8ff51151913b7f7b2c8b486b5e7fad8 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 08:02:36 +0000 Subject: [PATCH 03/22] Add test_coast_paint_country_single() and test_coast_paint_country_multiple() to test_coast.py --- pygmt/tests/test_coast.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index fa9526e161b..5737655e214 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -69,3 +69,34 @@ def test_coast_world_mercator(): water="white", ) return fig + + +@check_figures_equal() +def test_coast_paint_country_single(): + "Test passing a single country code to paint_country" + fig_ref, fig_test = Figure(), Figure() + # Use single-character arguments for the reference image + fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="ES+gbisque+pblue") + fig_test.coast( + region=[-10, 15, 25, 44], + frame="a", + projection="M15c", + land="brown", + paint_country="ES+gbisque+pblue", + ) + return fig_ref, fig_test + +@check_figures_equal() +def test_coast_paint_country_multiple(): + "Test passing multiple country code to paint_country" + fig_ref, fig_test = Figure(), Figure() + # Use single-character arguments for the reference image + fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="ES,IT+gbisque+pblue") + fig_test.coast( + region=[-10, 15, 25, 44], + frame="a", + projection="M15c", + land="brown", + paint_country="ES,IT+gbisque+pblue", + ) + return fig_ref, fig_test \ No newline at end of file From 91b42f9af374169cd6150ac5c06361d4d78eff8c Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 08:05:02 +0000 Subject: [PATCH 04/22] Add test_coast_paint_country_list() to test_coast.py --- pygmt/tests/test_coast.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index 5737655e214..bfa33a737ba 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -86,6 +86,7 @@ def test_coast_paint_country_single(): ) return fig_ref, fig_test + @check_figures_equal() def test_coast_paint_country_multiple(): "Test passing multiple country code to paint_country" @@ -99,4 +100,26 @@ def test_coast_paint_country_multiple(): land="brown", paint_country="ES,IT+gbisque+pblue", ) - return fig_ref, fig_test \ No newline at end of file + return fig_ref, fig_test + + +@check_figures_equal() +def test_coast_paint_country_list(): + "Test passing a list of country codes and fill options to paint_country" + fig_ref, fig_test = Figure(), Figure() + # Use single-character arguments for the reference image + fig_ref.coast( + R="-10/15/25/44", + J="M15c", + B="a", + G="brown", + E=["ES+gbisque+pgreen", "IT+gcyan+pblue"], + ) + fig_test.coast( + region=[-10, 15, 25, 44], + frame="a", + projection="M15c", + land="brown", + paint_country=["ES+gbisque+pgreen", "IT+gcyan+pblue"], + ) + return fig_ref, fig_test From f098b329cb696b874be7512882e48add8d20bc08 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 08:06:46 +0000 Subject: [PATCH 05/22] Add test_coast_paint_country_continent() to test_coast.py --- pygmt/tests/test_coast.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index bfa33a737ba..01bce09fc6a 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -123,3 +123,19 @@ def test_coast_paint_country_list(): paint_country=["ES+gbisque+pgreen", "IT+gcyan+pblue"], ) return fig_ref, fig_test + + +@check_figures_equal() +def test_coast_paint_country_continent(): + "Test passing a continent code to paint_country" + fig_ref, fig_test = Figure(), Figure() + # Use single-character arguments for the reference image + fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="=AF+gbisque+pblue") + fig_test.coast( + region=[-10, 15, 25, 44], + frame="a", + projection="M15c", + land="brown", + paint_country="=AF+gbisque+pblue", + ) + return fig_ref, fig_test From 7b25dca4566efc4b37b5869c7d2cb9b5f0b86f04 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Fri, 25 Dec 2020 08:13:19 +0000 Subject: [PATCH 06/22] Add test_coast_paint_country_state() to test_coast.py --- pygmt/tests/test_coast.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index 01bce09fc6a..76451d90dfa 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -139,3 +139,21 @@ def test_coast_paint_country_continent(): paint_country="=AF+gbisque+pblue", ) return fig_ref, fig_test + + +@check_figures_equal() +def test_coast_paint_country_state(): + "Test passing a US state code to paint_country" + fig_ref, fig_test = Figure(), Figure() + # Use single-character arguments for the reference image + fig_ref.coast( + R="-75/-69/40/44", J="M15c", B="a", G="brown", E="US.MA+gbisque+pblue" + ) + fig_test.coast( + region=[-75, -69, 40, 44], + frame="a", + projection="M15c", + land="brown", + paint_country="US.MA+gbisque+pblue", + ) + return fig_ref, fig_test From 57bf7fd0b655572767f89da1e8539515815a5440 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Tue, 29 Dec 2020 08:54:34 +0000 Subject: [PATCH 07/22] Explain +z and +l|+L; add links for ISO codes and DCW --- pygmt/base_plotting.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 26cebc4da96..ce64750d3a6 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -138,14 +138,19 @@ def coast(self, **kwargs): Draw shorelines [Default is no shorelines]. Append pen attributes. paint_country : str or list ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` - Select painting or dumping country polygons from the Digital Chart of the - World. Append one or more comma-separated countries using the 2-character - ISO 3166-1 alpha-2 convention. To select a state of a country - (if available), append .state, (e.g, US.TX for Texas). To specify a whole - continent, prepend = to any of the continent codes (e.g. =EU for Europe). + Select painting or dumping country polygons from the + 'Digital Chart of the World `__. + Append one or more comma-separated countries using the 2-character + `ISO 3166-1 alpha-2 convention `__. + To select a state of a country (if available), append + .state, (e.g, US.TX for Texas). To specify a whole continent, prepend = to + any of the continent codes (e.g. =EU for Europe). Append **+p**pen to draw polygon outlines (default is no outline) - and **+g**fill to fill them (default is no fill). To apply different - settings to different countries, pass a list of string arguments. + and **+g**fill to fill them (default is no fill). Append **+l**|**+L** + to *=continent* to only list countries in that continent; repeat if more + than one continent is requested. Append **+z** to place the country code in + the segment headers via -Zcode settings.To apply different settings to + different countries, pass a list of string arguments. {XY} {p} {t} From 31468772d95604b4a8cae0bf371ef7c5922aca5d Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Tue, 29 Dec 2020 08:57:37 +0000 Subject: [PATCH 08/22] Adding line break between link text and URL for styling --- pygmt/base_plotting.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index ce64750d3a6..e1c2aeb05eb 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -139,9 +139,11 @@ def coast(self, **kwargs): paint_country : str or list ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` Select painting or dumping country polygons from the - 'Digital Chart of the World `__. + 'Digital Chart of the World + `__. Append one or more comma-separated countries using the 2-character - `ISO 3166-1 alpha-2 convention `__. + `ISO 3166-1 alpha-2 convention + `__. To select a state of a country (if available), append .state, (e.g, US.TX for Texas). To specify a whole continent, prepend = to any of the continent codes (e.g. =EU for Europe). From 0c7877c232ca98452942db1ab307a239c8e91061 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Tue, 29 Dec 2020 09:13:56 +0000 Subject: [PATCH 09/22] Fix link formatting typo --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index e1c2aeb05eb..c8ef93a2486 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -139,7 +139,7 @@ def coast(self, **kwargs): paint_country : str or list ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` Select painting or dumping country polygons from the - 'Digital Chart of the World + `Digital Chart of the World `__. Append one or more comma-separated countries using the 2-character `ISO 3166-1 alpha-2 convention From 8ffa8eb0dac999c1ebe5017ecbbdf1beb38ddbe0 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Thu, 31 Dec 2020 11:29:15 +0000 Subject: [PATCH 10/22] Update paint_country to dcw --- pygmt/base_plotting.py | 4 ++-- pygmt/tests/test_coast.py | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index c8ef93a2486..2e9a32dd905 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -62,7 +62,7 @@ def _preprocess(self, **kwargs): # pylint: disable=no-self-use A="area_thresh", B="frame", D="resolution", - E="paint_country", + E="dcw", I="rivers", L="map_scale", N="borders", @@ -136,7 +136,7 @@ def coast(self, **kwargs): shorelines : str ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. - paint_country : str or list + dcw : str or list ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` Select painting or dumping country polygons from the `Digital Chart of the World diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index 76451d90dfa..6837974f3af 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -72,8 +72,8 @@ def test_coast_world_mercator(): @check_figures_equal() -def test_coast_paint_country_single(): - "Test passing a single country code to paint_country" +def test_coast_dcw_single(): + "Test passing a single country code to dcw" fig_ref, fig_test = Figure(), Figure() # Use single-character arguments for the reference image fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="ES+gbisque+pblue") @@ -82,14 +82,14 @@ def test_coast_paint_country_single(): frame="a", projection="M15c", land="brown", - paint_country="ES+gbisque+pblue", + dcw="ES+gbisque+pblue", ) return fig_ref, fig_test @check_figures_equal() -def test_coast_paint_country_multiple(): - "Test passing multiple country code to paint_country" +def test_coast_dcw_multiple(): + "Test passing multiple country code to dcw" fig_ref, fig_test = Figure(), Figure() # Use single-character arguments for the reference image fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="ES,IT+gbisque+pblue") @@ -98,14 +98,14 @@ def test_coast_paint_country_multiple(): frame="a", projection="M15c", land="brown", - paint_country="ES,IT+gbisque+pblue", + dcw="ES,IT+gbisque+pblue", ) return fig_ref, fig_test @check_figures_equal() -def test_coast_paint_country_list(): - "Test passing a list of country codes and fill options to paint_country" +def test_coast_dcw_list(): + "Test passing a list of country codes and fill options to dcw" fig_ref, fig_test = Figure(), Figure() # Use single-character arguments for the reference image fig_ref.coast( @@ -120,14 +120,14 @@ def test_coast_paint_country_list(): frame="a", projection="M15c", land="brown", - paint_country=["ES+gbisque+pgreen", "IT+gcyan+pblue"], + dcw=["ES+gbisque+pgreen", "IT+gcyan+pblue"], ) return fig_ref, fig_test @check_figures_equal() -def test_coast_paint_country_continent(): - "Test passing a continent code to paint_country" +def test_coast_dcw_continent(): + "Test passing a continent code to dcw" fig_ref, fig_test = Figure(), Figure() # Use single-character arguments for the reference image fig_ref.coast(R="-10/15/25/44", J="M15c", B="a", G="brown", E="=AF+gbisque+pblue") @@ -136,14 +136,14 @@ def test_coast_paint_country_continent(): frame="a", projection="M15c", land="brown", - paint_country="=AF+gbisque+pblue", + dcw="=AF+gbisque+pblue", ) return fig_ref, fig_test @check_figures_equal() -def test_coast_paint_country_state(): - "Test passing a US state code to paint_country" +def test_coast_dcw_state(): + "Test passing a US state code to dcw" fig_ref, fig_test = Figure(), Figure() # Use single-character arguments for the reference image fig_ref.coast( @@ -154,6 +154,6 @@ def test_coast_paint_country_state(): frame="a", projection="M15c", land="brown", - paint_country="US.MA+gbisque+pblue", + dcw="US.MA+gbisque+pblue", ) return fig_ref, fig_test From 43aa7aa95be1a1ec4fd629fe08bc39c02cf05cd3 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Sat, 2 Jan 2021 10:31:17 +0000 Subject: [PATCH 11/22] Update for dcw alias in test_coast.py --- pygmt/tests/test_coast.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index 2eb6441abc8..f3b80205c77 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -58,6 +58,7 @@ def test_coast_aliases(): Y="a10c", p="135/25", t=13, + E="MA+gred" ) fig_test.coast( region=[-30, 30, -40, 40], # R @@ -76,6 +77,7 @@ def test_coast_aliases(): yshift="a10c", # Y perspective=[135, 25], # p transparency=13, # t + dcw="MA+gred", # E ) return fig_ref, fig_test From 68c03f1adfeea3973df983e917378d0dd91b9fd5 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Sun, 3 Jan 2021 10:24:37 +0000 Subject: [PATCH 12/22] Run make format --- pygmt/tests/test_coast.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index a019f0e8c30..f2ef15ec9a1 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -57,7 +57,7 @@ def test_coast_aliases(): Y="a10c", p="135/25", t=13, - E="MA+gred" + E="MA+gred", ) fig_test.coast( region=[-30, 30, -40, 40], # R @@ -75,7 +75,7 @@ def test_coast_aliases(): yshift="a10c", # Y perspective=[135, 25], # p transparency=13, # t - dcw="MA+gred", # E + dcw="MA+gred", # E ) return fig_ref, fig_test From f036a8b6385c908bc41f4bbe8a4f0f8a962b5bc4 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Wed, 13 Jan 2021 09:51:59 +0000 Subject: [PATCH 13/22] Update pygmt/base_plotting.py Co-authored-by: Dongdong Tian --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 2e9a32dd905..04be3045512 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -145,7 +145,7 @@ def coast(self, **kwargs): `ISO 3166-1 alpha-2 convention `__. To select a state of a country (if available), append - .state, (e.g, US.TX for Texas). To specify a whole continent, prepend = to + .*state*, (e.g, US.TX for Texas). To specify a whole continent, prepend = to any of the continent codes (e.g. =EU for Europe). Append **+p**pen to draw polygon outlines (default is no outline) and **+g**fill to fill them (default is no fill). Append **+l**|**+L** From 0713d2d0e1ed0f3a312453c0cf7489a08ee2019a Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Wed, 13 Jan 2021 09:53:37 +0000 Subject: [PATCH 14/22] Update pygmt/base_plotting.py Co-authored-by: Dongdong Tian --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 04be3045512..586dd99a917 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -147,7 +147,7 @@ def coast(self, **kwargs): To select a state of a country (if available), append .*state*, (e.g, US.TX for Texas). To specify a whole continent, prepend = to any of the continent codes (e.g. =EU for Europe). - Append **+p**pen to draw polygon outlines (default is no outline) + Append **+p**\ *pen* to draw polygon outlines (default is no outline) and **+g**fill to fill them (default is no fill). Append **+l**|**+L** to *=continent* to only list countries in that continent; repeat if more than one continent is requested. Append **+z** to place the country code in From 1c8a8f7d90039e4724d7d4f7d75c1e169d34a945 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Sat, 16 Jan 2021 07:41:12 -0500 Subject: [PATCH 15/22] Update pygmt/base_plotting.py Co-authored-by: Dongdong Tian --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 586dd99a917..62d824cd219 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -148,7 +148,7 @@ def coast(self, **kwargs): .*state*, (e.g, US.TX for Texas). To specify a whole continent, prepend = to any of the continent codes (e.g. =EU for Europe). Append **+p**\ *pen* to draw polygon outlines (default is no outline) - and **+g**fill to fill them (default is no fill). Append **+l**|**+L** + and **+g**\ *fill* to fill them (default is no fill). Append **+l**\ |**+L** to *=continent* to only list countries in that continent; repeat if more than one continent is requested. Append **+z** to place the country code in the segment headers via -Zcode settings.To apply different settings to From b597dab2fe90c1b692c930670bc0b69b9ff31165 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Sat, 16 Jan 2021 07:41:42 -0500 Subject: [PATCH 16/22] Update pygmt/base_plotting.py Co-authored-by: Dongdong Tian --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 62d824cd219..1f97d602478 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -151,7 +151,7 @@ def coast(self, **kwargs): and **+g**\ *fill* to fill them (default is no fill). Append **+l**\ |**+L** to *=continent* to only list countries in that continent; repeat if more than one continent is requested. Append **+z** to place the country code in - the segment headers via -Zcode settings.To apply different settings to + the segment headers via **-Z**\ *code* settings.To apply different settings to different countries, pass a list of string arguments. {XY} {p} From ea0092cfa3aaab9332f593e5d8225882fb21ad4e Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Mon, 18 Jan 2021 01:03:47 +0000 Subject: [PATCH 17/22] Update docstring for dcw --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 2e9a32dd905..0bf302b8321 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -137,7 +137,7 @@ def coast(self, **kwargs): ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. dcw : str or list - ``code1,code2,…[+l|L][+gfill][+ppen][+z]`` + ``*code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ][**+p**\ *pen*\ ][**+z**]`` Select painting or dumping country polygons from the `Digital Chart of the World `__. From 668e6b601c0649b7dd4fa28455e2f2b0528d6d21 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Mon, 18 Jan 2021 01:16:01 +0000 Subject: [PATCH 18/22] Update formating --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 1b33c1ef095..da4113e671f 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -143,7 +143,7 @@ def coast(self, **kwargs): ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. dcw : str or list - ``*code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ][**+p**\ *pen*\ ][**+z**]`` + *code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ][**+p**\ *pen*\ ][**+z**] Select painting or dumping country polygons from the `Digital Chart of the World `__. From e92be48d0d0a8de4e206e6caacfc844787476088 Mon Sep 17 00:00:00 2001 From: Will Schlitzer Date: Mon, 18 Jan 2021 01:19:34 +0000 Subject: [PATCH 19/22] Correct line lengths --- pygmt/base_plotting.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index da4113e671f..1a51856d0f0 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -143,7 +143,8 @@ def coast(self, **kwargs): ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. dcw : str or list - *code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ][**+p**\ *pen*\ ][**+z**] + *code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ] + [**+p**\ *pen*\ ][**+z**] Select painting or dumping country polygons from the `Digital Chart of the World `__. @@ -151,14 +152,15 @@ def coast(self, **kwargs): `ISO 3166-1 alpha-2 convention `__. To select a state of a country (if available), append - .*state*, (e.g, US.TX for Texas). To specify a whole continent, prepend = to - any of the continent codes (e.g. =EU for Europe). - Append **+p**\ *pen* to draw polygon outlines (default is no outline) - and **+g**\ *fill* to fill them (default is no fill). Append **+l**\ |**+L** - to *=continent* to only list countries in that continent; repeat if more - than one continent is requested. Append **+z** to place the country code in - the segment headers via **-Z**\ *code* settings.To apply different settings to - different countries, pass a list of string arguments. + .*state*, (e.g, US.TX for Texas). To specify a whole continent, + prepend **=** to any of the continent codes (e.g. =EU for Europe). + Append **+p**\ *pen* to draw polygon outlines + (default is no outline) and **+g**\ *fill* to fill them + (default is no fill). Append **+l**\ |**+L** to *=continent* to + only list countries in that continent; repeat if more than one + continent is requested. Append **+z** to place the country code in + the segment headers via **-Z**\ *code* settings.To apply different + settings to different countries, pass a list of string arguments. {XY} {p} {t} From c829ddfefb51af780237e6979fe7937d3189700b Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sun, 17 Jan 2021 21:18:19 -0500 Subject: [PATCH 20/22] Update pygmt/base_plotting.py --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 1a51856d0f0..65cfbed9cb4 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -152,7 +152,7 @@ def coast(self, **kwargs): `ISO 3166-1 alpha-2 convention `__. To select a state of a country (if available), append - .*state*, (e.g, US.TX for Texas). To specify a whole continent, + .\ *state*, (e.g, US.TX for Texas). To specify a whole continent, prepend **=** to any of the continent codes (e.g. =EU for Europe). Append **+p**\ *pen* to draw polygon outlines (default is no outline) and **+g**\ *fill* to fill them From 79da9b5fda820c0e9417c83a6aa0056b85a8bf93 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sun, 17 Jan 2021 21:37:23 -0500 Subject: [PATCH 21/22] Update pygmt/base_plotting.py --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 65cfbed9cb4..1b37d49d466 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -143,7 +143,7 @@ def coast(self, **kwargs): ``'[level/]pen'`` Draw shorelines [Default is no shorelines]. Append pen attributes. dcw : str or list - *code1,code2,…*\ [**+l**\ |**L**\ ][**+g**\ *fill*\ ] + *code1,code2,…*\ [**+l**\|\ **L**\ ][**+g**\ *fill*\ ] [**+p**\ *pen*\ ][**+z**] Select painting or dumping country polygons from the `Digital Chart of the World From 90218438cf9486156d3746bc2c796728f0a88587 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sun, 17 Jan 2021 21:37:29 -0500 Subject: [PATCH 22/22] Update pygmt/base_plotting.py --- pygmt/base_plotting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index 1b37d49d466..e77fcae58d5 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -156,7 +156,7 @@ def coast(self, **kwargs): prepend **=** to any of the continent codes (e.g. =EU for Europe). Append **+p**\ *pen* to draw polygon outlines (default is no outline) and **+g**\ *fill* to fill them - (default is no fill). Append **+l**\ |**+L** to *=continent* to + (default is no fill). Append **+l**\|\ **+L** to *=continent* to only list countries in that continent; repeat if more than one continent is requested. Append **+z** to place the country code in the segment headers via **-Z**\ *code* settings.To apply different