BUG: Fix index on the left side too

geopandas · Apr 28, 2015 · a1988eb · a1988eb
1 parent e22d654
commit a1988eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/geopandas/tools/sjoin.py b/geopandas/tools/sjoin.py
@@ -78,7 +78,7 @@ def find_contains(a1, a2):
                        r_idx,
                        check_predicates(
                            left_df['geometry']
-                           .apply(lambda x: prepared.prep(x)).values[l_idx],
+                           .apply(lambda x: prepared.prep(x))[l_idx],
                            right_df['geometry'][r_idx])
                        ]))
                )

diff --git a/tests/test_sjoin.py b/tests/test_sjoin.py
@@ -76,10 +76,8 @@ def test_sjoin_values(self):
         self.polydf.index = [1, 3, 4, 5, 6]
         df = sjoin(self.pointdf, self.polydf, how='left')
         self.assertEquals(df.shape, (21,8))
-        for i, row in df.iterrows():
-            self.assertEquals(row.geometry.type, 'Point')
-        self.assertTrue('pointattr1' in df.columns)
-        self.assertTrue('BoroCode' in df.columns)
+        df = sjoin(self.polydf, self.pointdf, how='left')
+        self.assertEquals(df.shape, (12,8))
 
     @unittest.skip("Not implemented")
     def test_sjoin_outer(self):