Merge pull request #261 from WeatherGod/fix_260

Perform input validation and casting on input variables. Closes #260.

Author: WeatherGod

lib/mpl_toolkits/basemap/__init__.py

@@ -503,6 +503,13 @@ def _validated_ll(param, name, minval, maxval):
                                            (name, minval, maxval))
     return param
 
+
+def _validated_or_none(param, name, minval, maxval):
+    if param is None:
+        return None
+    return _validated_ll(param, name, minval, maxval)
+
+
 def _insert_validated(d, param, name, minval, maxval):
     if param is not None:
         d[name] = _validated_ll(param, name, minval, maxval)
@@ -671,6 +678,18 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
         # set units to meters.
         projparams['units']='m'
         # check for sane values of lon_0, lat_0, lat_ts, lat_1, lat_2
+        lat_0 = _validated_or_none(lat_0, 'lat_0', -90, 90)
+        lat_1 = _validated_or_none(lat_1, 'lat_1', -90, 90)
+        lat_2 = _validated_or_none(lat_2, 'lat_2', -90, 90)
+        lat_ts = _validated_or_none(lat_ts, 'lat_ts', -90, 90)
+        lon_0 = _validated_or_none(lon_0, 'lon_0', -360, 720)
+        lon_1 = _validated_or_none(lon_1, 'lon_1', -360, 720)
+        lon_2 = _validated_or_none(lon_2, 'lon_2', -360, 720)
+        llcrnrlon = _validated_or_none(llcrnrlon, 'llcrnrlon', -360, 720)
+        urcrnrlon = _validated_or_none(urcrnrlon, 'urcrnrlon', -360, 720)
+        llcrnrlat = _validated_or_none(llcrnrlat, 'llcrnrlat', -90, 90)
+        urcrnrlat = _validated_or_none(urcrnrlat, 'urcrnrlat', -90, 90)
+
         _insert_validated(projparams, lat_0, 'lat_0', -90, 90)
         _insert_validated(projparams, lat_1, 'lat_1', -90, 90)
         _insert_validated(projparams, lat_2, 'lat_2', -90, 90)

lib/mpl_toolkits/basemap/test.py

@@ -191,7 +191,16 @@ def test_results_should_be_same_for_c_and_f_order_arrays(self):
         assert_almost_equal(yy1, yy2)
 
 
-
+class TestInputValidation(TestCase):
+    def test_optional_casting(self):
+        # Test for the bug reported in gh:#260
+        d = {'llcrnrlat': 28.979408, 'urcrnrlat': 35.19622,
+             'llcrnrlon': -95.614105, 'urcrnrlon': -77.554749,
+             'lon_0': -87.0, 'resolution': 'c', 'lat_0': 32.070374,
+             'projection': 'lcc'}
+        bmap1 = Basemap(lat_1=30.0, **d)
+        bmap2 = Basemap(lat_1=np.array([30.0], dtype='float32'), **d)
+        assert bmap1.proj4string == bmap2.proj4string
 
 
 def test():