Skip to content

Commit

Permalink
Refactored and cleaned up operations
Browse files Browse the repository at this point in the history
  • Loading branch information
@philippjfr
philippjfr committed May 20, 2018
1 parent e854d81 commit d1b410b
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 85 deletions.
182 changes: 97 additions & 85 deletions geoviews/operation/projection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from ..element import (Image, Shape, Polygons, Path, Points, Contours,
RGB, Graph, Nodes, EdgePaths, QuadMesh, VectorField,
HexTiles, Labels)
from ..util import project_extents, geom_to_array, wrap_path_data
from ..util import project_extents, geom_to_array, wrap_path_data, is_multi_geometry


class _project_operation(Operation):
Expand All @@ -31,7 +31,6 @@ def _process(self, element, key=None):
return element.map(self._process_element, self.supported_types)



class project_path(_project_operation):
"""
Projects Polygons and Path Elements from their source coordinate
Expand All @@ -40,89 +39,103 @@ class project_path(_project_operation):

supported_types = [Polygons, Path, Contours, EdgePaths]

def _project_path(self, element, path, data, boundary, geom_type, multi_type):
"""
Handle case of continuously varying path
"""
xdim, ydim = path.kdims[:2]
xs, ys = (path.dimension_values(0) for i in range(2))
if not len(xs):
return []

proj_arr = self.p.projection.quick_vertices_transform(
np.column_stack([xs, ys]), element.crs)

if proj_arr is None:
vertices = np.column_stack([xs, ys])
vertices = wrap_path_data(vertices, element.crs, element.crs)
path = geom_type(vertices)
path = path.intersection(boundary)
proj = self.p.projection.project_geometry(path, element.crs)
proj_arr = geom_to_array(proj)
data[xdim.name] = proj_arr[:, 0]
data[ydim.name] = proj_arr[:, 1]
return [data]

def _project_contour(self, element, contour, data, boundary, geom_type, multi_type):
"""
Handle case of iso-contour
"""
xdim, ydim = contour.kdims[:2]
data = {k: vals[0] for k, vals in data.items()}

# Wrap longitudes
vertices = wrap_path_data(contour.array([0, 1]), element.crs, element.crs)
geom = type(element)([vertices]).geom()

# Clip path to projection boundaries
geoms = []
for g in geom:
if np.isinf(np.array(g.array_interface_base['data'])).sum():
# Skip if infinity in path
continue
try:
# Compute boundary intersections
g = g.intersection(boundary)
except:
continue
if is_multi_geometry(g):
for p in g:
try:
geoms.append(geom_type(p))
except:
continue
else:
geoms.append(g)
if not geoms:
return []

# Project geometry
projected = []
geom = multi_type(geoms) if len(geoms) > 1 else geom
proj = self.p.projection.project_geometry(geom, element.crs)
proj = proj if is_multi_geometry(proj) else [proj]
for geom in proj:
vertices = np.array(geom.array_interface_base['data']).reshape(-1, 2)
xs, ys = vertices.T
if len(xs):
projected.append(dict(data, **{xdim.name: xs, ydim.name: ys}))
return projected

def _project_geodataframe(self, element):
geoms = element.split(datatype='geom')
projected = [self.p.projection.project_geometry(geom, element.crs)
for geom in geoms]
new_data = element.data.copy()
new_data['geometry'] = projected
return element.clone(new_data, crs=self.p.projection)

def _process_element(self, element):
if not len(element):
return element.clone(crs=self.p.projection)
elif element.interface.datatype == 'geodataframe':
geoms = element.split(datatype='geom')
projected = [self.p.projection.project_geometry(geom, element.crs)
for geom in geoms]
new_data = element.data.copy()
new_data['geometry'] = projected
return element.clone(new_data, crs=self.p.projection)
return self._project_geodataframe(element)

boundary_poly = element.crs.project_geometry(Polygon(self.p.projection.boundary),
self.p.projection)
boundary = element.crs.project_geometry(Polygon(self.p.projection.boundary),
self.p.projection)

if isinstance(element, Polygons):
multi_type, geom_type = MultiPolygon, Polygon
else:
multi_type, geom_type = MultiLineString, LineString
xdim, ydim = element.kdims[:2]

projected = []
for path in element.split():
data = {vd.name: path.dimension_values(vd, expanded=False) for vd in path.vdims}
if any(len(vals) > 1 for vals in data.values()):
# Handle continuously varying path case
geom = path.columns()
xs, ys = geom[xdim.name], geom[ydim.name]
if not len(xs):
continue

proj_arr = self.p.projection.quick_vertices_transform(
np.column_stack([xs, ys]), element.crs)

if proj_arr is None:
vertices = np.column_stack([xs, ys])
if isinstance(element.crs, ccrs.PlateCarree):
vertices = wrap_path_data(vertices, element.crs, element.crs)
path = geom_type(vertices)
path = path.intersection(boundary_poly)
proj = self.p.projection.project_geometry(path, element.crs)
proj_arr = geom_to_array(proj)
geom[xdim.name] = proj_arr[:, 0]
geom[ydim.name] = proj_arr[:, 1]
projected.append(geom)
projected += self._process_path(element, path, data, boundary, geom_type, multi_type)
else:
# Handle iso-contour case
data = {k: vals[0] for k, vals in data.items()}

# Wrap longitudes
if isinstance(element.crs, ccrs.PlateCarree):
vertices = wrap_path_data(path.array([0, 1]), element.crs, element.crs)
geom = type(element)([vertices]).geom()
else:
geom = path.geom()

# Clip path to projection boundaries
geoms = []
for g in geom:
if np.isinf(np.array(g.array_interface_base['data'])).sum():
continue
try:
g = g.intersection(boundary_poly)
except:
continue
if 'Multi' in g.geom_type or 'Collection' in g.geom_type:
for p in g:
try:
geoms.append(geom_type(p))
except:
continue
else:
geoms.append(g)

if not geoms:
continue
geom = multi_type(geoms)

# Project geometry
proj = self.p.projection.project_geometry(geom, element.crs)
for geom in proj:
vertices = np.array(geom.array_interface_base['data']).reshape(-1, 2)
xs, ys = vertices.T
if len(xs):
projected.append(dict(data, **{xdim.name: xs, ydim.name: ys}))
projected += self._process_contour(element, path, data, boundary, geom_type, multi_type)
return element.clone(projected, crs=self.p.projection)


Expand All @@ -137,9 +150,13 @@ class project_shape(_project_operation):
def _process_element(self, element):
if not len(element):
return element.clone(crs=self.p.projection)
geom = self.p.projection.project_geometry(element.geom(), element.crs)
if isinstance(geom, tuple):
geom = [g for g in geom if g != []][0]
geom = element.geom()
vertices = geom_to_array(geom)
if isinstance(geom, (MultiPolygon, Polygon)):
obj = Polygons([vertices])
else:
obj = Path([vertices])
geom = project_path(obj, projection=self.p.projection).geom()
return element.clone(geom, crs=self.p.projection)


Expand Down Expand Up @@ -353,16 +370,11 @@ class project(Operation):
instantiate=False, doc="""
Projection the image type is projected to.""")

_operations = [project_path, project_image, project_shape,
project_graph, project_quadmesh, project_points]

def _process(self, element, key=None):
element = element.map(project_path.instance(projection=self.p.projection),
project_path.supported_types)
element = element.map(project_image.instance(projection=self.p.projection),
project_image.supported_types)
element = element.map(project_shape.instance(projection=self.p.projection),
project_shape.supported_types)
element = element.map(project_graph.instance(projection=self.p.projection),
project_graph.supported_types)
element = element.map(project_quadmesh.instance(projection=self.p.projection),
project_quadmesh.supported_types)
return element.map(project_points.instance(projection=self.p.projection),
project_points.supported_types)
for op in self._operations:
element = element.map(op.instance(projection=self.p.projection),
op.supported_types)
return element
7 changes: 7 additions & 0 deletions geoviews/util.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,10 @@ def wrap_path_data(vertices, src_crs, tgt_crs):
vertices = vertices + [[-offset, 0]]
break
return vertices


def is_multi_geometry(geom):
"""
Whether the shapely geometry is a Multi or Collection type.
"""
return 'Multi' in geom.geom_type or 'Collection' in geom.geom_type

0 comments on commit d1b410b

Please sign in to comment.