Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed bug masking QuadMesh after projecting #250

Merged
merged 2 commits into from
Nov 6, 2018
Merged

Fixed bug masking QuadMesh after projecting #250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c245ddd
Fixed bug masking QuadMesh after projecting
philippjfr Nov 6, 2018
2fa052d
Further fix for QuadMesh project
philippjfr Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions geoviews/operation/projection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ def _process_element(self, element):
return element.clone(data, crs=self.projection)



class project_quadmesh(_project_operation):

supported_types = [QuadMesh]
Expand All @@ -220,22 +221,25 @@ def _process_element(self, element):
zs = element.dimension_values(2, flat=False)
if irregular:
X, Y = [np.asarray(element.interface.coords(
element, kd, expanded=True, edges=True))
element, kd, expanded=True, edges=False))
for kd in element.kdims]
else:
X = element.interface.coords(element, 0, True, True, True)
X = element.interface.coords(element, 0, True, True, False)
if np.all(X[0, 1:] < X[0, :-1]):
X = X[:, ::-1]
Y = element.interface.coords(element, 1, True, True, True)
Y = element.interface.coords(element, 1, True, True, False)
if np.all(Y[1:, 0] > X[:-1, 0]):
Y = Y[::-1, :]
zs = zs

Ny, Nx = X.shape
coords = proj.transform_points(element.crs, X.flatten(), Y.flatten())
if X.shape != zs.shape:
X = X[:-1] + np.diff(X, axis=0)/2.
X = X[:, :-1] + (np.diff(X, axis=1)/2.)
if Y.shape != zs.shape:
Y = Y[:-1] + np.diff(Y, axis=0)/2.
Y = Y[:, :-1] + (np.diff(Y, axis=1)/2.)

coords = proj.transform_points(element.crs, X, Y)
PX, PY = coords[..., 0], coords[..., 1]
xpoints = PX.reshape((Ny, Nx))
ypoints = PY.reshape((Ny, Nx))

# Mask quads which are wrapping around the x-axis
wrap_proj_types = (ccrs._RectangularProjection,
Expand All @@ -244,10 +248,9 @@ def _process_element(self, element):
ccrs.Mercator)
if isinstance(proj, wrap_proj_types):
with np.errstate(invalid='ignore'):

edge_lengths = np.hypot(
np.diff(xpoints , axis=1),
np.diff(ypoints, axis=1)
np.diff(PX, axis=1),
np.diff(PY, axis=1)
)
to_mask = (
(edge_lengths >= abs(proj.x_limits[1] -
Expand All @@ -256,12 +259,18 @@ def _process_element(self, element):
)
if np.any(to_mask):
mask = np.zeros(zs.shape, dtype=np.bool)
mask[to_mask[:-1, :]] = True # Edges above a cell.
mask[to_mask[1:, :]] = True # Edges below a cell.
mask[:, 1:][to_mask] = True
mask[:, 2:][to_mask[:, :-1]] = True
mask[:, :-1][to_mask] = True
mask[:, :-2][to_mask[:, 1:]] = True
mask[1:, 1:][to_mask[:-1]] = True
mask[1:, :-1][to_mask[:-1]] = True
mask[:-1, 1:][to_mask[1:]] = True
mask[:-1, :-1][to_mask[1:]] = True
zs[mask] = np.NaN

params = get_param_values(element)
return QuadMesh((xpoints, ypoints, zs), crs=self.projection, **params)
return QuadMesh((PX, PY, zs), crs=self.projection, **params)


class project_image(_project_operation):
Expand Down