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

Merge pull request #66 from jtratner/fix-perf-issue

Browse Source 
PERF: Use faster version of list comprehension
This commit is contained in:
Kelsey Jordahl
2013-11-14 05:56:18 -08:00
parent 40b32dbe5d 0dc6f9e826
commit 06c335efe3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geopandas/geoseries.py
+5 -3
View File
@@ -101,8 +101,9 @@ class GeoSeries(Series):
if self.crs != other.crs:
warn('GeoSeries crs mismatch: {0} and {1}'.format(self.crs, other.crs))
this, other = self.align(other)
return GeoSeries([getattr(s[0], op)(s[1]) for s in zip(this, other)],
index=this.index, crs=self.crs)
return GeoSeries([getattr(this_elem, op)(other_elem)
for this_elem, other_elem in zip(this, other)],
index=this.index, crs=self.crs)
else:
return GeoSeries([getattr(s, op)(other) for s in self],
index=self.index, crs=self.crs)
@@ -112,7 +113,8 @@ class GeoSeries(Series):
"""Geometric operation that returns a pandas Series"""
if isinstance(other, GeoSeries):
this, other = self.align(other)
return Series([getattr(s[0], op)(s[1], **kwargs) for s in zip(this, other)],
return Series([getattr(this_elem, op)(other_elem, **kwargs) for
this_elem, other_elem in zip(this, other)],
index=this.index)
else:
return Series([getattr(s, op)(other, **kwargs) for s in self],