refactor masking of the shifted longitudes and data to a single place, since it is the same for 1d and 2d cases

Author: guziy

lib/mpl_toolkits/basemap/__init__.py

@@ -4810,13 +4810,7 @@ def shiftdata(self,lonsin,datain=None,lon_0=None):
                         datain_save[:,1:] = datain
                         datain_save[:,0] = datain[:,-1]
                         datain = datain_save
-                # mask points outside
-                # map region so they don't wrap back in the domain.
-                mask = np.logical_or(lonsin<lon_0-180,lonsin>lon_0+180)
-                lonsin = np.where(mask,1.e30,lonsin)
-                if datain is not None and mask.any():
-                    # superimpose on existing mask
-                    datain = ma.masked_where(mask, datain)
+
         # 1-d data.
         elif lonsin.ndim == 1:
             nlons = len(lonsin)
@@ -4855,12 +4849,15 @@ def shiftdata(self,lonsin,datain=None,lon_0=None):
                         datain_save[1:] = datain
                         datain_save[0] = datain[-1]
                         datain = datain_save
-                # mask points outside
-                # map region so they don't wrap back in the domain.
-                mask = np.logical_or(lonsin<lon_0-180,lonsin>lon_0+180)
-                lonsin = np.where(mask,1.e30,lonsin)
-                if datain is not None and mask.any():
-                    datain = ma.masked_where(mask, datain)
+
+        # mask points outside
+        # map region so they don't wrap back in the domain.
+        mask = np.logical_or(lonsin<lon_0-180,lonsin>lon_0+180)
+        lonsin = np.where(mask,1.e30,lonsin)
+        if datain is not None and mask.any():
+            datain = ma.masked_where(mask, datain)
+
+
         if datain is not None:
             return lonsin, datain
         else: