Implemented IGH Oceanic View #1561

jkrasting · 2020-05-15T15:46:45Z

Option to select 'land' or 'ocean' emphasis
Requires an update to the PROJ library and use of
a new projection (imh_o)
Ocean view works best with central_longitude=-160.

IGH Default View:

proj = ccrs.InterruptedGoodeHomolosine()

IGH New Optional Ocean View:

proj = ccrs.InterruptedGoodeHomolosine(central_longitude=-160,emphasis='ocean')

Rationale

This update provides new functionality for oceanographic plots that was not previously possible with the land-only focus of the current IGH projection.

Implications

None.

lib/cartopy/crs.py

stickler-ci · 2020-05-18T11:32:48Z

lib/cartopy/crs.py

        """
-        input_point_nans = np.isnan(x) | np.isnan(y)
+        input_point_nans = np.isnan(x) | np.isnan(y) | \
+                           np.isinf(x) | np.isinf(y)


E127 continuation line over-indented for visual indent

QuLogic · 2020-07-02T04:47:21Z

Now that Proj 7.1.0 is out, we can add this. However, it will need a check that the version of Proj is new enough, like EqualEarth. It will also need an entry in the docs in docs/make_projection.py and docs/source/crs/projections.rst, and the what's new docs/whats_new.rst.

jkrasting · 2020-07-06T12:32:41Z

OK - sounds good. What is the timeline for the next version release?

QuLogic · 2020-07-07T01:32:28Z

No specific plans, but probably not for a couple months.

lib/cartopy/crs.py

jkrasting · 2020-09-15T21:46:38Z

@QuLogic - I added in a PROJ version check and updated the documentation. I didn't see a whats_new.rst file for the an new version, however.

jkrasting · 2020-09-15T21:49:30Z

QuLogic · 2021-01-19T06:20:13Z

Can you rebase to get working CI, and ensure that tests are passing?

lib/cartopy/crs.py

jkrasting · 2021-01-21T20:08:12Z

I rebased against the current master branch @QuLogic. I also squashed into a single commit.

jkrasting · 2021-02-03T14:49:28Z

@QuLogic - I don't really understand the tests well enough to understand how this is failing. Are you able to help me?

greglucas

Looks like this is really close. The minimum version test is currently failing due to an old proj being used. You'll need to add a pytest.skipif to check versions for this, something similar to this:

cartopy/lib/cartopy/tests/mpl/test_mpl_integration.py

Lines 243 to 244 in 4ca93c1

    
           @pytest.mark.skipif(ccrs.PROJ4_VERSION < (5, 2, 0), 
        
                               reason='Proj is too old.')

But probably within the parameterized function itself rather than as a decorator.

Do you want to add an image comparison for the new projection?

greglucas · 2021-06-11T13:41:55Z

docs/source/whats_new.rst

 Features
 --------

+* John Krasting added the ability to use the oceanic view


This is for the previous release What's New. We generally make this while doing the release. You can add yourself to the contributors list now though.
https://github.com/SciTools/cartopy/blob/master/docs/source/contributors.rst

greglucas · 2021-06-11T13:47:11Z

lib/cartopy/crs.py

+        """
+        Parameters
+        ----------
+        central_longitude: optional


Suggested change

central_longitude: optional

central_longitude : float, optional

All of these should have a space after the name, then the type, followed by optional. See here for the parameter spec: https://numpydoc.readthedocs.io/en/latest/format.html#parameters

jkrasting · 2021-06-11T14:34:16Z

Thanks for your help @greglucas! In regard to this suggestion:

Do you want to add an image comparison for the new projection?

Did you mean add a figure in lib/cartopy/tests/mpl/baseline_images/mpl/test_crs or are you suggesting something different?

greglucas · 2021-06-11T14:41:11Z

Yes, I think that would be a good place for it. Just to make sure the image for the ocean view is coming out as you expect.

jkrasting · 2021-06-11T15:58:36Z

@greglucas - thanks for the feedback. I think everything is addressed now. This PR is blocked again from running the CI, but everything seems to check out OK on my fork: https://github.com/jkrasting/cartopy/actions/runs/929096625

greglucas

I think this is a nice addition and good to go. I'll hold off merging for a few days in case anyone else has comments/suggestions on it.

jkrasting · 2021-06-11T20:58:10Z

I think this is a nice addition and good to go. I'll hold off merging for a few days in case anyone else has comments/suggestions on it.

Thanks for your help @greglucas. Looking forward to seeing this in a future release!

docs/source/crs/projections.rst

QuLogic · 2021-08-06T07:15:33Z

Can you rebase to fix the conflicts?

- The ocean emphasis for the Interrupted Goode Homolosine projection (imh_o) requires proj version 7.1.0 or later. - Option to select 'land' or 'ocean' emphasis - Increaed n resolution from 31 points to 91 points - Added docstring for class - Added images of both land and ocean views

- Applies to InterruptedGoodeHomolosine views

- Added tests for ocean view in addition to the existing land view - Values should be the same for both views

- While the emphasis="land" option is the default, these modifications will ensure that the MPL tests are always run with the option.

- The Interrupted Goode Homolosine ocean projection requires Proj version 7.1.0 or greater.

- Added tests for both land and ocean

- Follows NumPy formatting

jkrasting · 2021-08-06T19:10:50Z

Yes, just rebased now.

jkrasting · 2021-08-09T11:20:25Z

@greglucas, @QuLogic - looks like this needs a workflow approval for parts of the CI to run.

QuLogic · 2021-08-09T20:26:38Z

Thanks @jkrasting!

SciTools-assistant added Blocked: CLA needed See https://scitools.org.uk. Submit the form at: https://scitools.org.uk/cla/v4/form and removed Blocked: CLA needed See https://scitools.org.uk. Submit the form at: https://scitools.org.uk/cla/v4/form labels May 15, 2020

jkrasting mentioned this pull request May 15, 2020

Implemented IGH Oceanic View OSGeo/PROJ#2226

Merged

jkrasting force-pushed the dev/igh_o branch from 773f6df to 84786c0 Compare May 17, 2020 14:08

stickler-ci reviewed May 17, 2020

View reviewed changes

lib/cartopy/crs.py Outdated Show resolved Hide resolved

lib/cartopy/crs.py Outdated Show resolved Hide resolved

stickler-ci reviewed May 18, 2020

View reviewed changes

stickler-ci reviewed Sep 15, 2020

View reviewed changes

lib/cartopy/crs.py Outdated Show resolved Hide resolved

lib/cartopy/crs.py Outdated Show resolved Hide resolved

lib/cartopy/crs.py Outdated Show resolved Hide resolved

lib/cartopy/crs.py Outdated Show resolved Hide resolved

jkrasting force-pushed the dev/igh_o branch from cb71df6 to ad28892 Compare January 21, 2021 19:26

stickler-ci reviewed Jan 21, 2021

View reviewed changes

lib/cartopy/crs.py Outdated Show resolved Hide resolved

lib/cartopy/crs.py Outdated Show resolved Hide resolved

jkrasting commented Jan 21, 2021

View reviewed changes

lib/cartopy/crs.py Outdated Show resolved Hide resolved

jkrasting commented Jan 21, 2021

View reviewed changes

lib/cartopy/crs.py Outdated Show resolved Hide resolved

jkrasting force-pushed the dev/igh_o branch from e5e4e54 to e42da75 Compare June 10, 2021 18:45

greglucas reviewed Jun 11, 2021

View reviewed changes

jkrasting force-pushed the dev/igh_o branch 3 times, most recently from 5416edd to 1bc6542 Compare June 11, 2021 15:51

greglucas approved these changes Jun 11, 2021

View reviewed changes

QuLogic reviewed Jul 19, 2021

View reviewed changes

docs/source/crs/projections.rst Show resolved Hide resolved

QuLogic approved these changes Aug 6, 2021

View reviewed changes

jkrasting added 9 commits August 6, 2021 11:57

Fixed stickler-ci whitespace issues

063bd36

Reverted number of boundary points to n=31

d41539e

- Applies to InterruptedGoodeHomolosine views

Updated unit tests for IGH projections

566c55b

- Added tests for ocean view in addition to the existing land view - Values should be the same for both views

Explicitly name igh "land" emphasis for MPL tests

5371e82

- While the emphasis="land" option is the default, these modifications will ensure that the MPL tests are always run with the option.

Skip IGH ocean tests if PROJ4 is too old

8bf9f15

- The Interrupted Goode Homolosine ocean projection requires Proj version 7.1.0 or greater.

Interrupted Goode Homolosine image tests

6adb03d

- Added tests for both land and ocean

Updated IGH docstring

1e2aefc

- Follows NumPy formatting

Added entry to contributors.rst

cb8d690

jkrasting force-pushed the dev/igh_o branch from 1bc6542 to cb8d690 Compare August 6, 2021 15:57

QuLogic added this to the 0.20 milestone Aug 9, 2021

QuLogic merged commit c44c2a6 into SciTools:master Aug 9, 2021

QuLogic added Component: Geometry transforms Component: proj Type: Enhancement labels Aug 9, 2021

greglucas mentioned this pull request Sep 25, 2024

Added winkel tripel projection class #2442

Open

	@pytest.mark.skipif(ccrs.PROJ4_VERSION < (5, 2, 0),
	reason='Proj is too old.')

	central_longitude: optional
	central_longitude : float, optional

Implemented IGH Oceanic View #1561

Implemented IGH Oceanic View #1561

Uh oh!

Conversation

jkrasting commented May 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rationale

Implications

Uh oh!

Uh oh!

Uh oh!

stickler-ci May 18, 2020

Choose a reason for hiding this comment

Uh oh!

QuLogic commented Jul 2, 2020

Uh oh!

jkrasting commented Jul 6, 2020 via email

Uh oh!

QuLogic commented Jul 7, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkrasting commented Sep 15, 2020

Uh oh!

jkrasting commented Sep 15, 2020

Uh oh!

QuLogic commented Jan 19, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkrasting commented Jan 21, 2021

Uh oh!

jkrasting commented Feb 3, 2021

Uh oh!

greglucas left a comment

Choose a reason for hiding this comment

Uh oh!

greglucas Jun 11, 2021

Choose a reason for hiding this comment

Uh oh!

greglucas Jun 11, 2021

Choose a reason for hiding this comment

Uh oh!

jkrasting commented Jun 11, 2021

Uh oh!

greglucas commented Jun 11, 2021

Uh oh!

jkrasting commented Jun 11, 2021

Uh oh!

greglucas left a comment

Choose a reason for hiding this comment

Uh oh!

jkrasting commented Jun 11, 2021

Uh oh!

Uh oh!

QuLogic commented Aug 6, 2021

Uh oh!

jkrasting commented Aug 6, 2021

Uh oh!

jkrasting commented Aug 9, 2021

Uh oh!

QuLogic commented Aug 9, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jkrasting commented May 15, 2020 •

edited

Loading