wassname/geopandas
1
0
Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-09-11 12:10:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix plotting nontrivially indexed Series

Browse Source 
Now uses numpy arrays, not array-likes, to ensure treatment as
Boolean indexes.
This commit is contained in:
Jeffrey Gerard
2016-07-11 13:58:27 +02:00
parent 0af50220a7
commit 0b6dfd096e
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geopandas/plotting.py
+16 -10
View File
@@ -284,13 +284,14 @@ def plot_series(s, cmap='Set1', color=None, ax=None, linewidth=1.0,
num_geoms = len(s.index)
if color:
colors = pd.Series([color] * num_geoms)
colors = np.array([color] * num_geoms)
else:
color_generator = gencolor(len(s), colormap=cmap)
colors = pd.Series([next(color_generator) for _ in xrange(num_geoms)])
colors = np.array([next(color_generator) for _ in xrange(num_geoms)])
# plot all Polygons and all MultiPolygon components in the same collection
poly_idx = (s.geometry.type == 'Polygon') | (s.geometry.type == 'MultiPolygon')
poly_idx = np.array(
(s.geometry.type == 'Polygon') | (s.geometry.type == 'MultiPolygon'))
polys = s.geometry[poly_idx]
if not polys.empty:
# Plot the fill with default or user-specified alpha, but do not draw
@@ -305,13 +306,15 @@ def plot_series(s, cmap='Set1', color=None, ax=None, linewidth=1.0,
linewidth=linewidth, **edges_kwds)
# plot all LineStrings and MultiLineString components in same collection
line_idx = (s.geometry.type == 'LineString') | (s.geometry.type == 'MultiLineString')
line_idx = np.array(
(s.geometry.type == 'LineString') |
(s.geometry.type == 'MultiLineString'))
lines = s.geometry[line_idx]
if not lines.empty:
plot_linestring_collection(ax, lines, colors[line_idx], False,
linewidth=linewidth, **color_kwds)
point_idx = (s.geometry.type == 'Point')
point_idx = np.array(s.geometry.type == 'Point')
points = s.geometry[point_idx]
if not points.empty:
plot_point_collection(ax, points, colors[point_idx], **color_kwds)
@@ -423,12 +426,12 @@ def plot_dataframe(s, column=None, cmap=None, color=None, linewidth=1.0,
categories = list(set(s[column].values))
categories.sort()
valuemap = dict([(k, v) for (v, k) in enumerate(categories)])
values = pd.Series([valuemap[k] for k in s[column]])
values = np.array([valuemap[k] for k in s[column]])
else:
values = s[column]
if scheme is not None:
binning = __pysal_choro(values, scheme, k=k)
values = pd.Series(binning.yb)
values = np.array(binning.yb)
# set categorical to True for creating the legend
categorical = True
binedges = [binning.yb.min()] + binning.bins.tolist()
@@ -442,7 +445,8 @@ def plot_dataframe(s, column=None, cmap=None, color=None, linewidth=1.0,
mx = values.max() if vmax is None else vmax
# plot all Polygons and all MultiPolygon components in the same collection
poly_idx = (s.geometry.type == 'Polygon') | (s.geometry.type == 'MultiPolygon')
poly_idx = np.array(
(s.geometry.type == 'Polygon') | (s.geometry.type == 'MultiPolygon'))
polys = s.geometry[poly_idx]
if not polys.empty:
# Plot the fill with default or user-specified alpha, but do not draw
@@ -461,14 +465,16 @@ def plot_dataframe(s, column=None, cmap=None, color=None, linewidth=1.0,
linewidth=linewidth, **edges_kwds)
# plot all LineStrings and MultiLineString components in same collection
line_idx = (s.geometry.type == 'LineString') | (s.geometry.type == 'MultiLineString')
line_idx = np.array(
(s.geometry.type == 'LineString') |
(s.geometry.type == 'MultiLineString'))
lines = s.geometry[line_idx]
if not lines.empty:
plot_linestring_collection(ax, lines, values[line_idx], True,
vmin=mn, vmax=mx, cmap=cmap,
linewidth=linewidth, **color_kwds)
point_idx = (s.geometry.type == 'Point')
point_idx = np.array(s.geometry.type == 'Point')
points = s.geometry[point_idx]
if not points.empty:
plot_point_collection(ax, points, values[point_idx],
geopandas/tests/test_plotting.py
+3 -2
View File
@@ -137,7 +137,8 @@ class TestLineStringPlotting(unittest.TestCase):
self.N = 10
values = np.arange(self.N)
self.lines = GeoSeries([LineString([(0, i), (4, i+0.5), (9, i)])
for i in xrange(self.N)])
for i in xrange(self.N)],
index=list('ABCDEFGHIJ'))
self.df = GeoDataFrame({'geometry': self.lines, 'values': values})
def test_single_color(self):
@@ -189,7 +190,7 @@ class TestPolygonPlotting(unittest.TestCase):
t1 = Polygon([(0, 0), (1, 0), (1, 1)])
t2 = Polygon([(1, 0), (2, 0), (2, 1)])
self.polys = GeoSeries([t1, t2])
self.polys = GeoSeries([t1, t2], index=list('AB'))
self.df = GeoDataFrame({'geometry': self.polys, 'values': [0, 1]})
multipoly1 = MultiPolygon([t1, t2])