Update safe_msi for new pyproj compatibility

satpy/readers/msi_safe.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (c) 2016-2017 Satpy developers
+# Copyright (c) 2016-2020 Satpy developers
 #
 # This file is part of satpy.
 #
@@ -15,8 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # satpy.  If not, see <http://www.gnu.org/licenses/>.
-"""SAFE MSI L1C reader.
-"""
+"""SAFE MSI L1C reader."""
 
 import logging
 
@@ -41,8 +40,10 @@
 
 
 class SAFEMSIL1C(BaseFileHandler):
+    """File handler for SAFE MSI files (jp2)."""
 
     def __init__(self, filename, filename_info, filetype_info, mda):
+        """Init the reader."""
         super(SAFEMSIL1C, self).__init__(filename, filename_info,
                                          filetype_info)
 
@@ -85,21 +86,26 @@ def get_dataset(self, key, info):
 
     @property
     def start_time(self):
+        """Get the start time."""
         return self._start_time
 
     @property
     def end_time(self):
+        """Get the end time."""
         return self._start_time
 
     def get_area_def(self, dsid):
+        """Get the area def."""
         if self._channel != dsid.name:
             return
         return self._mda.get_area_def(dsid)
 
 
 class SAFEMSIMDXML(BaseFileHandler):
+    """File handle for sentinel 2 safe XML manifest."""
 
     def __init__(self, filename, filename_info, filetype_info):
+        """Init the reader."""
         super(SAFEMSIMDXML, self).__init__(filename, filename_info,
                                            filetype_info)
         self._start_time = filename_info['observation_time']
@@ -110,14 +116,17 @@ def __init__(self, filename, filename_info, filetype_info):
 
     @property
     def start_time(self):
+        """Get start time."""
         return self._start_time
 
     @property
     def end_time(self):
+        """Get end time."""
         return self._start_time
 
     def get_area_def(self, dsid):
         """Get the area definition of the dataset."""
+        from pyproj import CRS
         geocoding = self.root.find('.//Tile_Geocoding')
         epsg = geocoding.find('HORIZONTAL_CS_CODE').text
         rows = int(geocoding.find('Size[@resolution="' + str(dsid.resolution) + '"]/NROWS').text)
@@ -132,7 +141,7 @@ def get_area_def(self, dsid):
                     self.tile,
                     "On-the-fly area",
                     self.tile,
-                    {'init': epsg},
+                    CRS(epsg),
                     cols,
                     rows,
                     area_extent)
@@ -145,6 +154,7 @@ def _do_interp(minterp, xcoord, ycoord):
         return res.reshape(xcoord.shape)
 
     def interpolate_angles(self, angles, resolution):
+        """Interpolate the angles."""
         # FIXME: interpolate in cartesian coordinates if the lons or lats are
         # problematic
         from geotiepoints.multilinear import MultilinearInterpolator
@@ -185,7 +195,6 @@ def _get_coarse_dataset(self, key, info):
 
     def get_dataset(self, key, info):
         """Get the dataset refered to by `key`."""
-
         angles = self._get_coarse_dataset(key, info)
         if angles is None:
             return