geopandas / geopandas / 890

5%

push

travis-ci

Fix for issue 251  (#335)

* Fixes problem with obscure error when performing an sjoin and the result of sjoin has no overlapping geometries. Now returns an empty GeoDataFrame.

* Added tests for sjoin correctly returning the GeoDataFrame when join result is empty. The test verifies whether the output GeoDataFrames correspond to those who would result in a Pandas join.

* Indention of test, as it was erronously placed outside class

* Added new tests for verifying correct merge when no overlapping geometries.

* Updated tests so they test whether the outputed GeoDataFrames equal the inteded ones.

* Updated tests again to include import of pandas.

* Skip the test if version of Pandas is below 0.17

* Minor changes for style and simplicity suggested by jorisvandenbossche.

* Added functionality to handle new output for more recent version of Pandas (i.e. from > 0.18.1). This is relevant for the output of right sided merges when there are no overlapping geometries.

* Fixed test for sjoin where right_idxs were constructed erroneously.

* Additional fix in test for sjoin where right_idxs for inner and left join were constructed erroneously.

32 of 32 new or added lines in 2 files covered. (100.0%)

2462 of 2832 relevant lines covered (86.94%)

11.11 hits per line