Skip to content

Globe instances default to WGS84 only if no args were passed #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Globe instances default to WGS84 only if no args were passed #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88cc40a
Globe instances default to WGS84 only if no args were passed
Jun 19, 2020
2d0f0fd
add a regression test
Jun 20, 2020
80fe033
inline comment spacing
Jun 20, 2020
8012ac8
remove comment as per PR review discussion
Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/cartopy/_crs.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class Globe(object):
Define an ellipsoid and, optionally, how to relate it to the real world.

"""
def __init__(self, datum=None, ellipse='WGS84',
def __init__(self, datum=None, ellipse=None,
semimajor_axis=None, semiminor_axis=None,
flattening=None, inverse_flattening=None,
towgs84=None, nadgrids=None):
Expand All @@ -127,7 +127,7 @@ class Globe(object):
datum
Proj "datum" definition. Defaults to None.
ellipse
Proj "ellps" definition. Defaults to 'WGS84'.
Proj "ellps" definition. Defaults to 'WGS84' if no arguments given.
semimajor_axis
Semimajor axis of the spheroid / ellipsoid. Defaults to None.
semiminor_axis
Expand All @@ -142,8 +142,13 @@ class Globe(object):
Passed through to the Proj definition. Defaults to None.

"""
args = (datum, ellipse, semimajor_axis, semiminor_axis,
flattening, inverse_flattening, towgs84, nadgrids)
args_defaults = zip(args, self.__init__.__defaults__)
all_defaults = all(arg == default for arg, default in args_defaults)

self.datum = datum
self.ellipse = ellipse
self.ellipse = 'WGS84' if all_defaults else ellipse
self.semimajor_axis = semimajor_axis
self.semiminor_axis = semiminor_axis
self.flattening = flattening
Expand Down
10 changes: 10 additions & 0 deletions lib/cartopy/tests/test_crs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,16 @@ def test_globe(self):
assert_arr_almost_eq(rugby_pt, (1400915, 1741319), decimal=0)
assert_arr_almost_eq(footy_pt, (155657, 193479), decimal=0)

def test_globe_defaults(self):
"""Regression test for #564"""
default_globe = ccrs.Globe()
assert default_globe.ellipse == 'WGS84'

eccentric_globe = ccrs.Globe(semimajor_axis=1000, semiminor_axis=500)
assert not eccentric_globe.ellipse
assert eccentric_globe.semimajor_axis == 1000
assert eccentric_globe.semiminor_axis == 500

def test_project_point(self):
point = sgeom.Point([0, 45])
multi_point = sgeom.MultiPoint([point, sgeom.Point([180, 45])])
Expand Down