Skip to content

Commit

Permalink
Merge pull request #59 from sinhrks/pandas
Browse files Browse the repository at this point in the history 
TST: Add pandas tests
  • Loading branch information
@sinhrks
sinhrks committed Apr 17, 2016
2 parents edf6498 + 5db6895 commit 7097f14
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install:
- conda create -q -n test-environment python=$PYTHON pip nose
- source activate test-environment
- if [[ "$SHAPELY" == "true" ]]; then
conda install numpy scipy shapely fiona matplotlib;
conda install numpy scipy pandas shapely fiona matplotlib;
fi
- python -m pip install flake8
- python setup.py install
Expand Down
104 changes: 103 additions & 1 deletion cesiumpy/plotting/tests/test_plotting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import unittest

import cesiumpy
from cesiumpy.testing import _skip_if_no_numpy, _skip_if_no_matplotlib
from cesiumpy.testing import (_skip_if_no_numpy, _skip_if_no_pandas,
_skip_if_no_matplotlib)


class TestScatter(unittest.TestCase):
Expand Down Expand Up @@ -120,6 +121,42 @@ def test_scatter_errors(self):
with nose.tools.assert_raises_regexp(ValueError, msg):
v.plot.scatter([130, 140, 150], [30, 40, 50], size=[1, 2])

def test_scatter_pandas(self):
_skip_if_no_pandas()
import pandas as pd
df = pd.DataFrame({'lon': [130, 140, 150],
'lat': [50, 60, 70],
'r': [10, 20, 30],
'c': ['r', 'g', 'b']})
# we can't use size column
v = cesiumpy.Viewer(divid='viewertest')
v.plot.scatter(x=df.lon, y=df.lat, size=df.r)
exp = """<script src="https://cesiumjs.org/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="http://cesiumjs.org/Cesium/Build/Cesium/Widgets/widgets.css" type="text/css">
<div id="viewertest" style="width:100%; height:100%;"><div>
<script type="text/javascript">
var widget = new Cesium.Viewer("viewertest");
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(130.0, 50.0, 0.0), point : {pixelSize : 10.0, color : Cesium.Color.WHITE}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(140.0, 60.0, 0.0), point : {pixelSize : 20.0, color : Cesium.Color.WHITE}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(150.0, 70.0, 0.0), point : {pixelSize : 30.0, color : Cesium.Color.WHITE}});
widget.zoomTo(widget.entities);
</script>"""
self.assertEqual(v.to_html(), exp)

v = cesiumpy.Viewer(divid='viewertest')
v.plot.scatter(x=df.lon, y=df.lat, size=df.r, color=df.c)
exp = """<script src="https://cesiumjs.org/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="http://cesiumjs.org/Cesium/Build/Cesium/Widgets/widgets.css" type="text/css">
<div id="viewertest" style="width:100%; height:100%;"><div>
<script type="text/javascript">
var widget = new Cesium.Viewer("viewertest");
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(130.0, 50.0, 0.0), point : {pixelSize : 10.0, color : Cesium.Color.RED}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(140.0, 60.0, 0.0), point : {pixelSize : 20.0, color : Cesium.Color.GREEN}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(150.0, 70.0, 0.0), point : {pixelSize : 30.0, color : Cesium.Color.BLUE}});
widget.zoomTo(widget.entities);
</script>"""
self.assertEqual(v.to_html(), exp)


class TestBar(unittest.TestCase):

Expand Down Expand Up @@ -218,6 +255,27 @@ def test_bar_bottom(self):
</script>"""
self.assertEqual(v.to_html(), exp)

def test_bar_pandas(self):
_skip_if_no_pandas()
import pandas as pd
df = pd.DataFrame({'lon': [130, 140, 150],
'lat': [50, 60, 70],
'h': [1e5, 2e5, 3e5],
'c': ['r', 'g', 'b']})
v = cesiumpy.Viewer(divid='viewertest')
v.plot.bar(x=df.lon, y=df.lat, z=df.h, color=df.c)
exp = """<script src="https://cesiumjs.org/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="http://cesiumjs.org/Cesium/Build/Cesium/Widgets/widgets.css" type="text/css">
<div id="viewertest" style="width:100%; height:100%;"><div>
<script type="text/javascript">
var widget = new Cesium.Viewer("viewertest");
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(130.0, 50.0, 50000.0), cylinder : {length : 100000.0, topRadius : 10000.0, bottomRadius : 10000.0, material : Cesium.Color.RED}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(140.0, 60.0, 100000.0), cylinder : {length : 200000.0, topRadius : 10000.0, bottomRadius : 10000.0, material : Cesium.Color.GREEN}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(150.0, 70.0, 150000.0), cylinder : {length : 300000.0, topRadius : 10000.0, bottomRadius : 10000.0, material : Cesium.Color.BLUE}});
widget.zoomTo(widget.entities);
</script>"""
self.assertEqual(v.to_html(), exp)


class TestLabel(unittest.TestCase):

Expand Down Expand Up @@ -327,6 +385,28 @@ def test_label_size_list(self):
</script>"""
self.assertEqual(v.to_html(), exp)

def test_label_pandas(self):
_skip_if_no_pandas()
import pandas as pd
df = pd.DataFrame({'lon': [130, 140, 150],
'lat': [50, 60, 70],
's': [1, 2, 3],
'label': ['a', 'b', 'c'],
'c': ['r', 'g', 'b']})
v = cesiumpy.Viewer(divid='viewertest')
v.plot.label(df.label, x=df.lon, y=df.lat, size=df.s, color=df.c)
exp = """<script src="https://cesiumjs.org/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="http://cesiumjs.org/Cesium/Build/Cesium/Widgets/widgets.css" type="text/css">
<div id="viewertest" style="width:100%; height:100%;"><div>
<script type="text/javascript">
var widget = new Cesium.Viewer("viewertest");
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(130.0, 50.0, 0.0), label : {text : "a", fillColor : Cesium.Color.RED, scale : 1.0}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(140.0, 60.0, 0.0), label : {text : "b", fillColor : Cesium.Color.GREEN, scale : 2.0}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(150.0, 70.0, 0.0), label : {text : "c", fillColor : Cesium.Color.BLUE, scale : 3.0}});
widget.zoomTo(widget.entities);
</script>"""
self.assertEqual(v.to_html(), exp)


class TestPin(unittest.TestCase):

Expand Down Expand Up @@ -547,6 +627,28 @@ def test_contour_xyz(self):
self.assertEqual(viewer.entities[0].material,
cesiumpy.color.Color(0.0, 0.0, 0.5, 1.0))

def test_pin_pandas(self):
_skip_if_no_pandas()
import pandas as pd
df = pd.DataFrame({'lon': [130, 140, 150],
'lat': [50, 60, 70],
's': [10, 20, 30],
'label': ['a', 'b', 'c'],
'c': ['r', 'g', 'b']})
v = cesiumpy.Viewer(divid='viewertest')
v.plot.pin(x=df.lon, y=df.lat, size=df.s, color=df.c, text=df.label)
exp = """<script src="https://cesiumjs.org/Cesium/Build/Cesium/Cesium.js"></script>
<link rel="stylesheet" href="http://cesiumjs.org/Cesium/Build/Cesium/Widgets/widgets.css" type="text/css">
<div id="viewertest" style="width:100%; height:100%;"><div>
<script type="text/javascript">
var widget = new Cesium.Viewer("viewertest");
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(130.0, 50.0, 0.0), billboard : {image : new Cesium.PinBuilder().fromText("a", Cesium.Color.RED, 10.0)}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(140.0, 60.0, 0.0), billboard : {image : new Cesium.PinBuilder().fromText("b", Cesium.Color.GREEN, 20.0)}});
widget.entities.add({position : Cesium.Cartesian3.fromDegrees(150.0, 70.0, 0.0), billboard : {image : new Cesium.PinBuilder().fromText("c", Cesium.Color.BLUE, 30.0)}});
widget.zoomTo(widget.entities);
</script>"""
self.assertEqual(v.to_html(), exp)


if __name__ == '__main__':
nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],
Expand Down
8 changes: 8 additions & 0 deletions cesiumpy/testing.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ def _skip_if_no_numpy():
raise nose.SkipTest("no numpy module")


def _skip_if_no_pandas():
try:
import pandas # noqa
except ImportError:
import nose
raise nose.SkipTest("no pandas module")


def _skip_if_no_scipy():
try:
import scipy.spatial # noqa
Expand Down

0 comments on commit 7097f14

Please sign in to comment.