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

Implement alignment in binary operations

Browse Source
This commit is contained in:
Kelsey Jordahl committed 2013-07-02 08:37:58 -04:00
1 parent 5f2f47d268
commit 90a4da287e
1 file changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files
geopandas/geoseries.py
+6 -7
View File
@@ -108,9 +108,9 @@ class GeoSeries(Series):
Operation that returns a GeoSeries
"""
if isinstance(other, GeoSeries):
# TODO: align series
return GeoSeries([getattr(s[0], op)(s[1]) for s in zip(self, other)],
index=self.index)
this, other = self.align(other)
return GeoSeries([getattr(s[0], op)(s[1]) for s in zip(this, other)],
index=this.index)
else:
return GeoSeries([getattr(s, op)(other) for s in self],
index=self.index)
@@ -121,10 +121,9 @@ class GeoSeries(Series):
Geometric operation that returns a pandas Series
"""
if isinstance(other, GeoSeries):
# TODO: align series
print [getattr(s[0], op)(s[1]) for s in zip(self, other)]
return Series([getattr(s[0], op)(s[1]) for s in zip(self, other)],
index=self.index)
this, other = self.align(other)
return Series([getattr(s[0], op)(s[1]) for s in zip(this, other)],
index=this.index)
else:
return Series([getattr(s, op)(other) for s in self],
index=self.index)