From 13ed9268a731d639990b8b157512593755900159 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Wed, 11 Oct 2023 16:07:11 -0500 Subject: [PATCH 1/2] Remove unnecessary proj4 argument parsing from get_area_def --- pyresample/area_config.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyresample/area_config.py b/pyresample/area_config.py index a7a79eeac..b941faeb3 100644 --- a/pyresample/area_config.py +++ b/pyresample/area_config.py @@ -360,8 +360,8 @@ def get_area_def(area_id, area_name, proj_id, proj4_args, width, height, area_ex Description of area proj_id : str ID of projection - proj4_args : list, dict, or str - Proj4 arguments as list of arguments or string + proj4_args : dict, CRS, or str + Projection information passed to pyproj's CRS object width : int Number of pixel in x dimension height : int @@ -374,7 +374,6 @@ def get_area_def(area_id, area_name, proj_id, proj4_args, width, height, area_ex area_def : object AreaDefinition object """ - proj_dict = _get_proj4_args(proj4_args) return create_area_def(area_id, proj_dict, description=area_name, proj_id=proj_id, shape=(height, width), area_extent=area_extent) From 0c6289bf08c83ccc6bcadd85584e98843c8c232a Mon Sep 17 00:00:00 2001 From: David Hoese Date: Wed, 11 Oct 2023 16:11:47 -0500 Subject: [PATCH 2/2] Rename proj4 argument to use --- pyresample/area_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyresample/area_config.py b/pyresample/area_config.py index b941faeb3..b5d7722a6 100644 --- a/pyresample/area_config.py +++ b/pyresample/area_config.py @@ -374,7 +374,7 @@ def get_area_def(area_id, area_name, proj_id, proj4_args, width, height, area_ex area_def : object AreaDefinition object """ - return create_area_def(area_id, proj_dict, description=area_name, proj_id=proj_id, + return create_area_def(area_id, proj4_args, description=area_name, proj_id=proj_id, shape=(height, width), area_extent=area_extent)