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

COMPAT: fix tests of Matplotlib 2.0.0 (#551)

Browse Source 
* Fix default cmap for Matplotlib 2.0.0.

* TST: Fix determination of expected dash style.

In Matplotlib 2.0.0, there was a minimum dash length that was eventually
removed because it was problematic. The expected line style does not
apply this minimum.
This commit is contained in:
Elliott Sales de Andrade
2017-09-19 20:48:52 -07:00
committed by James McBride
parent 4e8da4a08a
commit 661e2da4e8
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geopandas/plotting.py
+4 -1
View File
@@ -402,8 +402,11 @@ def plot_dataframe(df, column=None, cmap=None, color=None, ax=None,
# Define `values` as a Series
if categorical:
if cmap is None:
if LooseVersion(matplotlib.__version__) >= '2.0':
if LooseVersion(matplotlib.__version__) >= '2.0.1':
cmap = 'tab10'
elif LooseVersion(matplotlib.__version__) >= '2.0.0':
# Erroneous name.
cmap = 'Vega10'
else:
cmap = 'Set1'
categories = list(set(df[column].values))
geopandas/tests/test_plotting.py
+17 -14
View File
@@ -184,24 +184,26 @@ class TestLineStringPlotting:
_check_colors(self.N, ax.collections[0].get_colors(), ['green']*self.N)
def test_style_kwargs(self):
# linestyle (style patterns depend on linewidth, therefore pin to 1)
linestyle = 'dashed'
ax = self.lines.plot(linestyle=linestyle, linewidth=1)
exp_ls = _style_to_linestring_onoffseq(linestyle)
for ls in ax.collections[0].get_linestyles():
assert ls[0] == exp_ls[0]
assert tuple(ls[1]) == exp_ls[1]
linewidth = 1
ax = self.df.plot(linestyle=linestyle, linewidth=1)
ax = self.lines.plot(linestyle=linestyle, linewidth=linewidth)
exp_ls = _style_to_linestring_onoffseq(linestyle, linewidth)
for ls in ax.collections[0].get_linestyles():
assert ls[0] == exp_ls[0]
assert tuple(ls[1]) == exp_ls[1]
assert ls[1] == exp_ls[1]
ax = self.df.plot(column='values', linestyle=linestyle, linewidth=1)
ax = self.df.plot(linestyle=linestyle, linewidth=linewidth)
for ls in ax.collections[0].get_linestyles():
assert ls[0] == exp_ls[0]
assert tuple(ls[1]) == exp_ls[1]
assert ls[1] == exp_ls[1]
ax = self.df.plot(column='values', linestyle=linestyle,
linewidth=linewidth)
for ls in ax.collections[0].get_linestyles():
assert ls[0] == exp_ls[0]
assert ls[1] == exp_ls[1]
class TestPolygonPlotting:
@@ -469,10 +471,10 @@ class TestPlotCollections:
# pass through of kwargs
coll = plot_linestring_collection(ax, self.lines, linestyle='--',
linewidth=1)
exp_ls = _style_to_linestring_onoffseq('dashed')
exp_ls = _style_to_linestring_onoffseq('dashed', 1)
res_ls = coll.get_linestyle()[0]
assert res_ls[0] == exp_ls[0]
assert tuple(res_ls[1]) == exp_ls[1]
assert res_ls[1] == exp_ls[1]
ax.cla()
def test_linestrings_values(self):
@@ -619,14 +621,15 @@ def _check_colors(N, actual_colors, expected_colors, alpha=None):
'{} != {}'.format(actual, conv.to_rgba(expected, alpha=alpha))
def _style_to_linestring_onoffseq(linestyle):
def _style_to_linestring_onoffseq(linestyle, linewidth):
""" Converts a linestyle string representation, namely one of:
['dashed', 'dotted', 'dashdot', 'solid'],
documented in `Collections.set_linestyle`,
to the form `onoffseq`.
"""
if LooseVersion(matplotlib.__version__) >= '2.0':
return matplotlib.lines._get_dash_pattern(linestyle)
offset, dashes = matplotlib.lines._get_dash_pattern(linestyle)
return matplotlib.lines._scale_dashes(offset, dashes, linewidth)
else:
from matplotlib.backend_bases import GraphicsContextBase
return GraphicsContextBase.dashd[linestyle]