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

Merge pull request #64 from jwass/crstest

Browse Source 
Crstest
This commit is contained in:
Kelsey Jordahl
2013-11-11 18:36:49 -08:00
parent f6e545cdde b557e44c3c
commit d080911c04
2 changed files with 12 additions and 5 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):
tests/util.py
+8 -1
View File
@@ -136,7 +136,8 @@ def assert_geoseries_equal(left, right, check_dtype=False,
check_index_type=False,
check_series_type=True,
check_less_precise=False,
check_geom_type=False):
check_geom_type=False,
check_crs=True):
"""Test util for checking that two GeoSeries are equal.
Parameters
@@ -154,6 +155,9 @@ def assert_geoseries_equal(left, right, check_dtype=False,
if True, use geom_almost_equals. if False, use geom_equals.
check_geom_type : bool, default False
if True, check that all the geom types are equal.
check_crs: bool, default True
if check_series_type is True, then also check that the
crs matches
"""
assert len(left) == len(right), "%d != %d" % (len(left), len(right))
@@ -167,6 +171,9 @@ def assert_geoseries_equal(left, right, check_dtype=False,
if check_series_type:
assert isinstance(left, GeoSeries)
assert_isinstance(left, type(right))
if check_crs:
assert(left.crs == right.crs)
else:
if not isinstance(left, GeoSeries):
left = GeoSeries(left)