Merge pull request #29 from Chilipp/master

Add scipy and fix bug for projected data with plot=poly

Author: Chilipp

CHANGELOG.rst

@@ -1,3 +1,17 @@
+v1.3.1
+======
+
+Added
+-----
+- ``scipy`` is now a run dependency of psy-maps (see
+  `#27 <https://github.com/psyplot/psy-maps/issues/27>`__)
+
+Fixed
+-----
+- fixed a bug when using ``plot="poly"`` for data on non-standard projections
+  (i.e. anything that is not ``cartopy.crs.PlateCarree``). See
+  `#29 <https://github.com/psyplot/psy-maps/pull/29>`__).
+
 v1.3.0
 ======
 New GUI widgets and better projection support

ci/conda-recipe/meta.yaml

@@ -22,6 +22,7 @@ requirements:
     - psyplot >1.2.1
     - psy-simple
     - cartopy
+    - scipy  # required for plotting with cartopy
 
 test:
   imports:

psy_maps/plotters.py

@@ -1719,8 +1719,7 @@ def _polycolor(self):
                     yb = yb[~mask]
             self.logger.debug('Making plot with %i cells', arr.size)
             transformed = proj.transform_points(
-                t.as_geodetic(), xb.ravel(), yb.ravel())[..., :2].reshape(
-                    xb.shape + (2, ))
+                t, xb.ravel(), yb.ravel())[..., :2].reshape(xb.shape + (2,))
             self._plot = PolyCollection(
                 transformed, array=arr.ravel(),
                 norm=self.bounds.norm, rasterized=True, cmap=cmap,
@@ -1817,8 +1816,7 @@ def update(self, value):
                 xb = xb[~mask]
                 yb = yb[~mask]
         orig_shape = xb.shape
-        transformed = proj.transform_points(t.as_geodetic(), xb.ravel(),
-                                            yb.ravel())
+        transformed = proj.transform_points(t, xb.ravel(), yb.ravel())
         xb = transformed[..., 0].reshape(orig_shape)
         yb = transformed[..., 1].reshape(orig_shape)
         # We insert nan values in the flattened edges arrays rather than

setup.py

@@ -66,6 +66,7 @@ def run_tests(self):
           'psyplot>=1.3.0',
           'psy-simple>=1.3.0',
           'cartopy',
+          'scipy',  # required for plotting with cartopy
       ],
       project_urls={
           'Documentation': 'https://psyplot.readthedocs.io/projects/psy-maps',

tests/rotated-pole-test.nc

@@ -1735,5 +1735,18 @@ def _label_test(self, key, label_func, has_time=None):
 del cls
 
 
+def test_rotated_pole_poly():
+    """Test function for https://github.com/psyplot/psy-maps/issues/28"""
+    test_file = os.path.join(bt.test_dir, "rotated-pole-test.nc")
+    with psy.plot.mapplot(test_file, name="t2m", plot="poly") as sp:
+        plotter = sp.plotters[0]
+        minx, maxx = plotter.ax.get_xlim()
+        miny, maxy = plotter.ax.get_ylim()
+        assert abs(minx - -30.88) < 2
+        assert abs(maxx - 19.95) < 2
+        assert abs(miny - -26.21) < 2
+        assert abs(maxy - 31.88) < 2
+
+
 if __name__ == '__main__':
     bt.RefTestProgram()