Skip to content
Snippets Groups Projects

Bugfix/implement pyresample changes

Merged Daniel Scheffler requested to merge bugfix/implement_pyresample_changes into master
8 files
+ 20
18
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -18,7 +18,6 @@ except ImportError:
# NOTE: In case of ImportError: dlopen: cannot load any more object with static TLS,
# one could add 'from pykdtree.kdtree import KDTree' here (before pyresample import)
from pyresample.geometry import AreaDefinition, SwathDefinition
from pyresample.utils import get_area_def
from pyresample.bilinear import resample_bilinear
from pyresample.kd_tree import resample_nearest, resample_gauss, resample_custom
@@ -677,14 +676,14 @@ class SensorMapGeometryTransformer(object):
out_extent = xmin, ymin, xmax, ymax
# get area_definition
area_definition = get_area_def(area_id='',
area_name='',
proj_id='',
proj4_args=get_proj4info(proj=tgt_prj),
x_size=x_size,
y_size=y_size,
area_extent=list(out_extent),
) # type: AreaDefinition
area_definition = AreaDefinition(area_id='',
description='',
proj_id='',
projection=get_proj4info(proj=tgt_prj),
width=x_size,
height=y_size,
area_extent=list(out_extent),
)
return area_definition
@@ -763,10 +762,10 @@ class SensorMapGeometryTransformer(object):
out_gt, out_prj = self._get_gt_prj_from_areadefinition(self.area_definition)
# output validation
if not data_mapgeo.shape[:2] == (self.area_definition.y_size, self.area_definition.x_size):
if not data_mapgeo.shape[:2] == (self.area_definition.height, self.area_definition.width):
raise RuntimeError('The computed map geometry output does not have the expected number of rows/columns. '
'Expected: %s; output: %s.'
% (str((self.area_definition.y_size, self.area_definition.x_size)),
% (str((self.area_definition.height, self.area_definition.width)),
str(data_mapgeo.shape[:2])))
if data.ndim > 2 and data_mapgeo.ndim == 2:
raise RuntimeError('The computed map geometry output only one band instead of the expected %d bands.'
Loading