Skip to content

Commit fcb784d

Browse files
committed
DEPR: implement API changes that were scheduled for cartopy>0.18
1 parent ecabeb8 commit fcb784d

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

lib/cartopy/crs.py

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ class TransverseMercator(Projection):
14021402

14031403
def __init__(self, central_longitude=0.0, central_latitude=0.0,
14041404
false_easting=0.0, false_northing=0.0,
1405-
scale_factor=1.0, globe=None, approx=None):
1405+
scale_factor=1.0, globe=None, approx=False):
14061406
"""
14071407
Parameters
14081408
----------
@@ -1428,12 +1428,6 @@ def __init__(self, central_longitude=0.0, central_latitude=0.0,
14281428
will change to False in the next release.
14291429
14301430
"""
1431-
if approx is None:
1432-
warnings.warn('The default value for the *approx* keyword '
1433-
'argument to TransverseMercator will change '
1434-
'from True to False after 0.18.',
1435-
stacklevel=2)
1436-
approx = True
14371431
proj4_params = [('proj', 'tmerc'), ('lon_0', central_longitude),
14381432
('lat_0', central_latitude), ('k', scale_factor),
14391433
('x_0', false_easting), ('y_0', false_northing),
@@ -1462,13 +1456,7 @@ def y_limits(self):
14621456

14631457

14641458
class OSGB(TransverseMercator):
1465-
def __init__(self, approx=None):
1466-
if approx is None:
1467-
warnings.warn('The default value for the *approx* keyword '
1468-
'argument to OSGB will change from True to '
1469-
'False after 0.18.',
1470-
stacklevel=2)
1471-
approx = True
1459+
def __init__(self, approx=False):
14721460
super().__init__(central_longitude=-2, central_latitude=49,
14731461
scale_factor=0.9996012717,
14741462
false_easting=400000, false_northing=-100000,
@@ -1491,13 +1479,7 @@ def y_limits(self):
14911479

14921480

14931481
class OSNI(TransverseMercator):
1494-
def __init__(self, approx=None):
1495-
if approx is None:
1496-
warnings.warn('The default value for the *approx* keyword '
1497-
'argument to OSNI will change from True to '
1498-
'False after 0.18.',
1499-
stacklevel=2)
1500-
approx = True
1482+
def __init__(self, approx=False):
15011483
globe = Globe(semimajor_axis=6377340.189,
15021484
semiminor_axis=6356034.447938534)
15031485
super().__init__(central_longitude=-8, central_latitude=53.5,

0 commit comments

Comments
 (0)