Revert EWA-related changes

Revert "Fix pyproj Transform usage in ll2cr"

This reverts commit 45408da.

Revert "Remove unused CRS import in ll2cr cython"

This reverts commit b23d662.

Author: djhoese

pyresample/ewa/_ll2cr.pyx

@@ -23,14 +23,11 @@
 __docformat__ = "restructuredtext en"
 
 import numpy
-from pyproj import Transformer
-from pyproj.enums import TransformDirection
+from pyproj import Proj
 
 cimport cython
 cimport numpy
 
-from pyresample.utils.proj4 import get_geodetic_crs_with_no_datum_shift
-
 numpy.import_array()
 
 # column and rows can only be doubles for now until the PROJ.4 is linked directly so float->double casting can be done
@@ -43,18 +40,18 @@ cdef extern from "numpy/npy_math.h":
     bint npy_isnan(double x)
 
 
-def projection_circumference(t):
+def projection_circumference(p):
     """Return the projection circumference if the projection is cylindrical, None otherwise.
 
     Projections that are not cylindrical and centered on the globes axis
     can not easily have data cross the antimeridian of the projection.
     """
-    lon0, lat0 = t.transform(0, 0, direction=TransformDirection.INVERSE)
+    lon0, lat0 = p(0, 0, inverse=True)
     lon1 = lon0 + 180.0
     lat1 = lat0 + 5.0
-    x0, y0 = t.transform(lon0, lat0)  # should result in zero or near zero
-    x1, y1 = t.transform(lon1, lat0)
-    x2, y2 = t.transform(lon1, lat1)
+    x0, y0 = p(lon0, lat0)  # should result in zero or near zero
+    x1, y1 = p(lon1, lat0)
+    x2, y2 = p(lon1, lat1)
     if y0 != y1 or x1 != x2:
         return 0.0
     return abs(x1 - x0) * 2
@@ -64,7 +61,7 @@ def projection_circumference(t):
 @cython.wraparound(False)
 @cython.cdivision(True)
 def ll2cr_dynamic(numpy.ndarray[cr_dtype, ndim=2] lon_arr, numpy.ndarray[cr_dtype, ndim=2] lat_arr,
-                  cr_dtype fill_in, object src_crs, object dst_crs,
+                  cr_dtype fill_in, str proj4_definition,
                   double cell_width, double cell_height,
                   width=None, height=None,
                   origin_x=None, origin_y=None):
@@ -101,13 +98,13 @@ def ll2cr_dynamic(numpy.ndarray[cr_dtype, ndim=2] lon_arr, numpy.ndarray[cr_dtyp
     of limitations in pyproj.
     """
     # pure python stuff for now
-    t = Transformer.from_crs(src_crs, dst_crs, always_xy=True)
+    p = Proj(proj4_definition)
 
     # Pyproj currently makes a copy so we don't have to do anything special here
-    cdef tuple projected_tuple = t.transform(lon_arr, lat_arr)
+    cdef tuple projected_tuple = p(lon_arr, lat_arr)
     cdef cr_dtype[:, ::1] rows_out = projected_tuple[1]
     cdef cr_dtype[:, ::1] cols_out = projected_tuple[0]
-    cdef double proj_circum = projection_circumference(t)
+    cdef double proj_circum = projection_circumference(p)
     cdef unsigned int w
     cdef unsigned int h
     cdef double ox
@@ -206,7 +203,7 @@ def ll2cr_dynamic(numpy.ndarray[cr_dtype, ndim=2] lon_arr, numpy.ndarray[cr_dtyp
 @cython.wraparound(False)
 @cython.cdivision(True)
 def ll2cr_static(numpy.ndarray[cr_dtype, ndim=2] lon_arr, numpy.ndarray[cr_dtype, ndim=2] lat_arr,
-                 cr_dtype fill_in, object src_crs, object dst_crs,
+                 cr_dtype fill_in, str proj4_definition,
                  double cell_width, double cell_height,
                  unsigned int width, unsigned int height,
                  double origin_x, double origin_y):
@@ -232,11 +229,11 @@ def ll2cr_static(numpy.ndarray[cr_dtype, ndim=2] lon_arr, numpy.ndarray[cr_dtype
     of limitations in pyproj.
     """
     # TODO: Rewrite so it is no GIL
-    #   pure python stuff for now
-    t = Transformer.from_crs(src_crs, dst_crs, always_xy=True)
+    # pure python stuff for now
+    p = Proj(proj4_definition)
 
     # Pyproj currently makes a copy so we don't have to do anything special here
-    cdef tuple projected_tuple = t.transform(lon_arr, lat_arr)
+    cdef tuple projected_tuple = p(lon_arr, lat_arr)
     cdef cr_dtype[:, ::1] rows_out = projected_tuple[1]
     cdef cr_dtype[:, ::1] cols_out = projected_tuple[0]
     cdef cr_dtype[:, ::1] lons_view = lon_arr

pyresample/ewa/ewa.py

@@ -76,7 +76,7 @@ def ll2cr(swath_def, area_def, fill=np.nan, copy=True):
     ox = area_def.area_extent[0] + cw / 2.
     oy = area_def.area_extent[3] + ch / 2.
     swath_points_in_grid = _ll2cr.ll2cr_static(lons, lats, fill,
-                                               swath_def.crs, area_def.crs, cw, ch, w, h, ox, oy)
+                                               p, cw, ch, w, h, ox, oy)
     return swath_points_in_grid, lons, lats
 
 

pyresample/test/test_ewa_ll2cr.py

@@ -21,7 +21,6 @@
 import unittest
 
 import numpy as np
-from pyproj import CRS
 
 from pyresample.test.utils import create_test_latitude, create_test_longitude
 
@@ -71,15 +70,14 @@ def test_lcc_basic1(self):
         lat_arr = create_test_latitude(18.0, 40.0, (50, 100), dtype=np.float64)
         grid_info = static_lcc.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info["proj4_definition"]
         cw = grid_info["cell_width"]
         ch = grid_info["cell_height"]
         ox = grid_info["origin_x"]
         oy = grid_info["origin_y"]
         w = grid_info["width"]
         h = grid_info["height"]
-        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, src_crs, dst_crs,
+        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, proj_str,
                                              cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, lon_arr.size, "all these test points should fall in this grid")
 
@@ -94,15 +92,14 @@ def test_geo_antimeridian(self):
 
         grid_info = static_geo_whole_earth.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info['proj4_definition']
         cw = grid_info['cell_width']
         ch = grid_info['cell_height']
         ox = grid_info['origin_x']
         oy = grid_info['origin_y']
         w = grid_info['width']
         h = grid_info['height']
-        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, src_crs, dst_crs,
+        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, proj_str,
                                              cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, lon_arr.size,
                          'all these test points should fall in this grid')
@@ -113,15 +110,14 @@ def test_lcc_fail1(self):
         lat_arr = create_test_latitude(18.0, 40.0, (50, 100), dtype=np.float64)
         grid_info = static_lcc.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info["proj4_definition"]
         cw = grid_info["cell_width"]
         ch = grid_info["cell_height"]
         ox = grid_info["origin_x"]
         oy = grid_info["origin_y"]
         w = grid_info["width"]
         h = grid_info["height"]
-        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, src_crs, dst_crs,
+        points_in_grid = _ll2cr.ll2cr_static(lon_arr, lat_arr, fill_in, proj_str,
                                              cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, 0, "none of these test points should fall in this grid")
 
@@ -135,16 +131,14 @@ def test_latlong_basic1(self):
         lat_arr = create_test_latitude(15.0, 30.0, (50, 100), dtype=np.float64)
         grid_info = dynamic_wgs84.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info["proj4_definition"]
         cw = grid_info["cell_width"]
         ch = grid_info["cell_height"]
         ox = grid_info["origin_x"]
         oy = grid_info["origin_y"]
         w = grid_info["width"]
         h = grid_info["height"]
-        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in,
-                                                                              src_crs, dst_crs,
+        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in, proj_str,
                                                                               cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, lon_arr.size, "all points should be contained in a dynamic grid")
         self.assertIs(lon_arr, lon_res)
@@ -158,16 +152,14 @@ def test_latlong_basic2(self):
         lat_arr = create_test_latitude(15.0, 30.0, (50, 100), twist_factor=-0.1, dtype=np.float64)
         grid_info = dynamic_wgs84.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info["proj4_definition"]
         cw = grid_info["cell_width"]
         ch = grid_info["cell_height"]
         ox = grid_info["origin_x"]
         oy = grid_info["origin_y"]
         w = grid_info["width"]
         h = grid_info["height"]
-        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in,
-                                                                              src_crs, dst_crs,
+        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in, proj_str,
                                                                               cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, lon_arr.size, "all points should be contained in a dynamic grid")
         self.assertIs(lon_arr, lon_res)
@@ -181,16 +173,14 @@ def test_latlong_dateline1(self):
         lat_arr = create_test_latitude(15.0, 30.0, (50, 100), twist_factor=-0.1, dtype=np.float64)
         grid_info = dynamic_wgs84.copy()
         fill_in = np.nan
-        src_crs = CRS.from_epsg(4326)
-        dst_crs = CRS.from_proj4(grid_info["proj4_definition"])
+        proj_str = grid_info["proj4_definition"]
         cw = grid_info["cell_width"]
         ch = grid_info["cell_height"]
         ox = grid_info["origin_x"]
         oy = grid_info["origin_y"]
         w = grid_info["width"]
         h = grid_info["height"]
-        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in,
-                                                                              src_crs, dst_crs,
+        points_in_grid, lon_res, lat_res, ox, oy, w, h = _ll2cr.ll2cr_dynamic(lon_arr, lat_arr, fill_in, proj_str,
                                                                               cw, ch, w, h, ox, oy)
         self.assertEqual(points_in_grid, lon_arr.size, "all points should be contained in a dynamic grid")
         self.assertIs(lon_arr, lon_res)