Skip to content

Commit 431a06c

Browse files
committed
Rename projs variables
1 parent bbc3e91 commit 431a06c

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ ProPlot v0.3.0 (2020-01-##)
2323
``subplots.xlabspace``, and ``subplots.ylabspace`` spacing arguments,
2424
automatically calculate default non-tight spacing using `~proplot.subplots._get_space`
2525
based on current tick lengths, label sizes, etc.
26+
- Rename `basemap_defaults` to `~proplot.projs.basemap_kwargs` and `cartopy_projs`
27+
to `~proplot.projs.cartopy_names`.
2628

2729
.. rubric:: Features
2830

proplot/projs.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
__all__ = [
2222
'Proj',
23-
'basemap_defaults', 'cartopy_projs',
23+
'basemap_kwargs', 'cartopy_names',
2424
'Aitoff', 'Hammer', 'KavrayskiyVII',
2525
'NorthPolarAzimuthalEquidistant',
2626
'NorthPolarGnomonic',
@@ -146,7 +146,7 @@ def Proj(name, basemap=False, **kwargs):
146146
if basemap:
147147
import mpl_toolkits.basemap as mbasemap
148148
name = BASEMAP_TRANSLATE.get(name, name)
149-
kwproj = basemap_defaults.get(name, {})
149+
kwproj = basemap_kwargs.get(name, {})
150150
kwproj.update(kwargs)
151151
kwproj.setdefault('fix_aspect', True)
152152
if name[:2] in ('np', 'sp'):
@@ -165,7 +165,7 @@ def Proj(name, basemap=False, **kwargs):
165165
import cartopy.crs as _ # noqa
166166
kwargs = {CARTOPY_CRS_TRANSLATE.get(
167167
key, key): value for key, value in kwargs.items()}
168-
crs = cartopy_projs.get(name, None)
168+
crs = cartopy_names.get(name, None)
169169
if name == 'geos': # fix common mistake
170170
kwargs.pop('central_latitude', None)
171171
if 'boundinglat' in kwargs:
@@ -175,7 +175,7 @@ def Proj(name, basemap=False, **kwargs):
175175
if crs is None:
176176
raise ValueError(
177177
f'Unknown projection {name!r}. Options are: '
178-
+ ', '.join(map(repr, cartopy_projs.keys())))
178+
+ ', '.join(map(repr, cartopy_names.keys())))
179179
proj = crs(**kwargs)
180180
aspect = (np.diff(proj.x_limits) / np.diff(proj.y_limits))[0]
181181
return proj, aspect
@@ -377,7 +377,7 @@ def __init__(self, central_longitude=0.0, globe=None):
377377
#: Default keyword args for `~mpl_toolkits.basemap.Basemap` projections.
378378
#: `~mpl_toolkits.basemap` will raise an error if you don't provide them,
379379
#: so ProPlot imposes some sensible default behavior.
380-
basemap_defaults = {
380+
basemap_kwargs = {
381381
'eck4': {'lon_0': 0},
382382
'geos': {'lon_0': 0},
383383
'hammer': {'lon_0': 0},
@@ -409,11 +409,11 @@ def __init__(self, central_longitude=0.0, globe=None):
409409
}
410410

411411
#: Mapping of "projection names" to cartopy `~cartopy.crs.Projection` classes.
412-
cartopy_projs = {}
412+
cartopy_names = {}
413413
if _cartopy_installed:
414414
# Custom ones, these are always present
415415
import cartopy.crs as ccrs # verify package is available
416-
cartopy_projs = { # interpret string, create cartopy projection
416+
cartopy_names = { # interpret string, create cartopy projection
417417
'aitoff': Aitoff,
418418
'hammer': Hammer,
419419
'kav7': KavrayskiyVII,
@@ -469,7 +469,7 @@ def __init__(self, central_longitude=0.0, globe=None):
469469
if _class is None:
470470
_unavail.append(_name)
471471
continue
472-
cartopy_projs[_name] = _class
472+
cartopy_names[_name] = _class
473473
if _unavail:
474474
_warn_proplot(
475475
f'Cartopy projection(s) {", ".join(map(repr, _unavail))} are '

0 commit comments

Comments
 (0)