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

Fix tests to include crs when comparing GeoSeries

Browse Source
This commit is contained in:
Jacob Wasserman
2013-11-11 19:21:13 -05:00
parent 37377cf9ea
commit b557e44c3c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_geodataframe.py
+4 -4
View File
@@ -40,7 +40,7 @@ class TestDataFrame(unittest.TestCase):
data = {"A": range(5), "B": range(-5, 0),
"location": [Point(x, y) for x, y in zip(range(5), range(5))]}
df = GeoDataFrame(data, crs=self.crs, geometry='location')
locs = GeoSeries(data['location'])
locs = GeoSeries(data['location'], crs=self.crs)
tu.assert_geoseries_equal(df.geometry, locs)
self.assert_('geometry' not in df)
self.assertEqual(df.geometry.name, 'location')
@@ -55,7 +55,7 @@ class TestDataFrame(unittest.TestCase):
self.assertEqual(df2.geometry.crs, 'dummy_crs')
# reset so it outputs okay
df2.crs = df.crs
tu.assert_geoseries_equal(df2.geometry, GeoSeries(geom2))
tu.assert_geoseries_equal(df2.geometry, GeoSeries(geom2, crs=df2.crs))
# for right now, non-geometry comes back as series
tu.assert_geoseries_equal(df2['location'], df['location'],
check_series_type=False, check_dtype=False)
@@ -69,7 +69,7 @@ class TestDataFrame(unittest.TestCase):
range(len(self.df)))]
df.geometry = new_geom
new_geom = GeoSeries(new_geom, index=df.index)
new_geom = GeoSeries(new_geom, index=df.index, crs=df.crs)
tu.assert_geoseries_equal(df.geometry, new_geom)
tu.assert_geoseries_equal(df['geometry'], new_geom)
@@ -163,7 +163,7 @@ class TestDataFrame(unittest.TestCase):
geom = [Point(x,y) for x,y in zip(range(5), range(5))]
ret = self.df.set_geometry(geom, inplace=True)
self.assert_(ret is None)
geom = GeoSeries(geom, index=self.df.index)
geom = GeoSeries(geom, index=self.df.index, crs=self.df.crs)
tu.assert_geoseries_equal(self.df.geometry, geom)
def test_to_json(self):