Initial antimeridian handling refactoring

Author: djhoese

pyresample/geometry.py

@@ -1242,19 +1242,13 @@ def freeze(self, lonslats=None, resolution=None, shape=None, proj_info=None,
             projections and data cases not covering the north or south pole.
             The possible options are:
 
-            * "modify_extents": Set the X bounds to the edges of the data, but
-                add 360 to the right-most bound. This has the effect of making
-                the area coordinates continuous from the left side to the
-                right side. However, this means that some coordinates will be
-                outside the coordinate space of the projection. Although most
-                PROJ and pyresample functionality can handle this there may be
-                some edge cases.
-            * "modify_crs": Change the prime meridian of the projection
-                from 0 degrees longitude to 180 degrees longitude. This has
-                the effect of putting the data on a continuous coordinate
+            * "modify_extents": Deprecated. Use "modify_crs".
+            * "modify_crs": Modify the projection definition to wrap longitude
+                values so they are between 0 and 360 degrees (PROJ ``lon_wrap=180``).
+                This has the effect of putting the data on a continuous coordinate
                 system. However, this means that comparing data resampled to
-                this resulting area and an area not over the anti-meridian
-                would be more difficult.
+                this resulting area and an area not using this longitude
+                wrapping may require extra care.
             * "global_extents": Ignore the bounds of the data and use -180/180
                 degrees as the west and east bounds of the data. This will
                 generate a large output area, but with the benefit of keeping
@@ -1265,6 +1259,10 @@ def freeze(self, lonslats=None, resolution=None, shape=None, proj_info=None,
         Shape parameters are ignored if the instance is created
         with the `optimize_projection` flag set to True.
         """
+        if antimeridian_mode == "modify_extents":
+            warnings.warn("Antimeridian mode 'modify_extents' is deprecated. Use 'modify_crs' instead.", stacklevel=2)
+            antimeridian_mode = "modify_crs"
+
         with ignore_pyproj_proj_warnings():
             proj_dict = self._get_proj_dict()
         projection = self._projection
@@ -1311,7 +1309,7 @@ def _compute_bound_centers(self, proj_dict, lonslats, antimeridian_mode):
             # cross anti-meridian of projection
             xmin, xmax = self._compute_new_x_corners_for_antimeridian(xarr, antimeridian_mode)
             if antimeridian_mode == "modify_crs":
-                proj_dict.update({"pm": 180.0})
+                proj_dict.update({"lon_wrap": 180})
         return proj_dict, (xmin, ymin, xmax, ymax)
 
     @staticmethod
@@ -1334,9 +1332,6 @@ def _compute_new_x_corners_for_antimeridian(self, xarr, antimeridian_mode):
             xmax = np.nanmax(wrapped_array)
             if hasattr(wrapped_array, "compute"):
                 xmin, xmax = da.compute(xmin, xmax)
-            if antimeridian_mode == "modify_crs":
-                xmin -= 180
-                xmax -= 180
         return xmin, xmax
 
 

pyresample/kd_tree.py

@@ -973,6 +973,7 @@ def _create_resample_kdtree(self, chunks=CHUNK_SIZE):
             chunks=chunks)
         valid_input_idx = ((source_lons >= -180) & (source_lons <= 180) & (source_lats <= 90) & (source_lats >= -90))
         input_coords = lonlat2xyz(source_lons, source_lats)
+
         input_coords = input_coords[valid_input_idx.ravel(), :]
 
         # Build kd-tree on input

pyresample/utils/proj4.py

@@ -180,10 +180,11 @@ def ignore_pyproj_proj_warnings():
 def get_geodetic_crs_with_no_datum_shift(crs: CRS) -> CRS:
     """Get the geodetic CRS for the provided CRS but with no prime meridian shift."""
     gcrs = crs.geodetic_crs
-    if gcrs.prime_meridian.longitude == 0:
-        return gcrs
+    # if gcrs.prime_meridian.longitude == 0 and gcrs.lon:
+    #     return gcrs
     with ignore_pyproj_proj_warnings():
         gcrs_dict = gcrs.to_dict()
     gcrs_dict.pop("pm", None)
+    # gcrs_dict.pop("lon_wrap", None)
     gcrs_pm0 = CRS.from_dict(gcrs_dict)
     return gcrs_pm0