Commit Graph
805 Commits
Author SHA1 Message Date
James McBride bf8f8ea64e Omit tests from coverage report 2017-08-10 07:41:59 -07:00
James McBride 55d2d47d53 ENH: add cx indexer to GeoDataFrame (#471) (#482)
* Add coordinate indexing method cx to geodataframes

Add a few basic tests that it works on a geodataframe as it does for a
geoseries.

* Add docs on indexing, including slicing with cx

* Use consistent assert in gdf coord slice test

* Move _CoordinateIndexer to base module

With both geoseries and geodataframe modules using the class, base.py is
a better place to define the _CoordinateIndexer class.

Also add docs to the _CoordinateIndexer class.
2017-08-10 09:47:47 +02:00
Joris Van den Bossche e2722f36a5 DOC/TST: use datasets.get_path('nybb') in docs and tests (#480) 2017-08-09 09:38:23 +02:00
James McBride 74f8c90203 BUG: Fix handling of 0 slice in cx method (#477) (#478)
With the previous tests of the style xs.start or xmin, if xs.start
equalled 0, xmin was taken, ignoring the user specified slice boundary.
This fixes that issue, and adds miminal testing around slices with
boundaries at 0.
2017-08-08 09:06:47 +02:00
Joris Van den Bossche dd8bf019d3 Add NYC borough boundaries as included dataset (#384)
* Add NYC borough boundaries as included dataset

* TST: add tests for the datasets

* Add readme for datasets directory with attribution

* add description to README
2017-08-05 00:33:30 +02:00
Joris Van den Bossche cfc3ba329d TST: add more extensive tests of pandas functionality (#469)
* TST: add more extensive tests of pandas functionality

* add first groupby methods

* add get_group and select_dtypes

* ensure array input to where

* fix select dtypes test

* fix max test for python 2 (on python 2 objects are orderable, so max works)

* skip test for pandas 0.16

* windows fix int64

* fix skipif
2017-08-04 10:37:20 +02:00
James McBride cfb3120002 ENH: add access to x/y coordinates of point geoseries (#246) (#383) 2017-07-30 00:11:16 +02:00
Chris Holdgraf 9690870ea7 Change total_bounds to return an array (#459) 2017-07-29 23:03:34 +02:00
Micah Cochran 1731e44b2d TST: Add Pandas version 0.20.2 to travis matrix (#454)
Update newest tested matplotlib to version 1.5.3
2017-06-21 23:57:45 +02:00
Joris Van den Bossche e5f5eac7af CLN: clean up old compat code (#445) 2017-05-15 10:31:11 +02:00
James McBride ed2f8b4499 CLN: Remove deprecated PANDAS_NEW_SQL_API check (#442)
Was necessary to support pandas version <0.14, which is no longer
supported by geopandas.
2017-05-14 14:29:25 +02:00
Joris Van den Bossche 5d4a997301 Add a Gitter chat badge to README.md 2017-04-27 16:04:20 +02:00
Joris Van den Bossche 4abbe827b9 CLN/TST: remove usage of assert_isinstance from pandas (deprecated/removed) (#428) 2017-03-28 10:27:50 +02:00
Aleksey Bilogur 8ce1d41b6c ENH: Enable non-integer-indexed GeoDataFrame sjoin operations (#422) 2017-03-28 10:10:22 +02:00
Aleksey Bilogur 059cbeba06 add pytest cache to gitignore (#427) 2017-03-27 12:34:01 +02:00
Zhanzhao (Deo) Liang 46e4033a4a Fix some sindex issue (#403)
rename _sindex_valid to _sindex_generated to make it more understandable
2017-03-18 10:57:38 +01:00
James McBride 74eb7cd579 Match property behavior of cascaded_union to match unary_union (#394) 2017-03-18 10:55:41 +01:00
Joris Van den Bossche 8808ed509c TST: add more robust tests for sjoin (GH423) (#425)
* TST: add more robust tests for sjoin (GH423)
* fix right join test
* fix windows test
* use parametrized test + add tests (xfail) for non-default index
2017-03-17 22:27:59 +01:00
Aleksey Bilogur 92caf14356 CLN: more explicitly use row name as id in features (#421) 2017-03-14 20:00:53 +01:00
Joris Van den Bossche f9db55c6f1 Drop python 2.6/3.3, pandas 0.15, matplotlib 1.2/1.3 (#413) 2017-03-09 08:49:04 +01:00
Joris Van den Bossche 5db2ad1149 DOC: update README 2017-03-04 13:50:18 +01:00
Joris Van den Bossche 92070adf78 DOC: update coverage link to use codecov 2017-03-04 13:49:49 +01:00
Joris Van den Bossche 159f11f2cc TST: switch to codecov for coverage testing (#414) 2017-03-04 13:47:53 +01:00
Joris Van den Bossche 56f981ed13 TST: remove explicit building wheels - wheels are now available on PyPI - use pip cache (#408)
* TST: remove building wheels - wheels are now available on PyPI

* add pip cache

* also remove pip wheel for pandas/matplotlib

* don't remove cython for master builds
2017-02-28 12:30:53 +01:00
Joris Van den Bossche d8f74732ef TST: fix matplotlib to 1.5.3 on appveyor (#409)
Our tests are still failing for the newest matplotlib 2.0 due to the style changes, so until that is fixed, pin matplotlib to 1.5 on appveyor.
2017-02-28 12:27:59 +01:00
Tim Tröndle 3d39798503 Fix dissolve retains crs (#389) 2017-01-13 22:31:48 +01:00
Joris Van den Bossche 8333b951e8 TST: skip sindex tests on appveyor for now 2017-01-08 14:55:50 +01:00
Joris Van den Bossche 4a62bc7387 TST: add appveyor windows testing 2017-01-08 14:55:50 +01:00
James McBride 72de26ffbd Update CONTRIBUTING.md (#385)
Fix link to pandas contribution guidelines.
2017-01-08 13:23:24 +01:00
James McBride 8b14e8d036 Add tests for plotting points/polys with z coord. (#382) 2017-01-07 21:47:00 +01:00
Joris Van den Bossche ab0f1d2777 TST: switch remaining nose to pytest (#380) 2017-01-05 09:31:49 +01:00
James McBride 82bdd06a4e ENH: preserve column order in read_file (#378) (#379) 2017-01-04 09:23:38 +01:00
Nick Grue c7b4acb715 Changes hard-coded reference to geometry column in sjoin operation (#374) 2017-01-04 00:46:53 +01:00
Kelsey Jordahl fde2a21826 Merge pull request #267 from IamJeffG/259-plotting-collections
Implement plotting using matplotlib Collections
2016-12-28 14:25:51 -06:00
nickwg03 cf6c1f25a2 BUG: fixed fiona filter results where bbox is not None (#372)
* fixed fiona filter resulsts where bbox is not None

* adds test to ensure bbox used in read_file returns a filtered subset of features
2016-10-28 18:42:51 +02:00
nickwg03 cc59a58181 BUG: nybb zip file no longer exists. (#373)
* Referencing the new nybb file uploaded to the geopandas repo seems to do the trick
2016-10-28 18:11:27 +02:00
Joris Van den Bossche 46e50fe5a7 Fix usage of versioneer in setup.py (#362) 2016-07-24 09:56:34 +02:00
mlyons-tcc b048d13271 VIS: rraise ValuError on unsupported scheme, fixes #359: (#360) 2016-07-14 21:30:44 +02:00
mlyons-tcc 7cdd3a9e0f VIS: let PySAL use its own logic for k, fixes #356 (#358) 2016-07-14 18:29:34 +02:00
Jeffrey Gerard f9395a036e speed improvement for polygons with linewidth=0 or alpha=1
Thanks to @mlyons-tcc for suggesting the optimization.
2016-07-11 20:50:43 +02:00
Jeffrey Gerard 0b6dfd096e Fix plotting nontrivially indexed Series
Now uses numpy arrays, not array-likes, to ensure treatment as
Boolean indexes.
2016-07-11 13:58:27 +02:00
abjer 80e7988526 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.
2016-07-06 01:08:32 +02:00
Jeffrey Gerard 0af50220a7 PEP8 clean-up 2016-06-28 14:49:11 -05:00
Joris Van den Bossche 7247acbcbb TST: test with latest 0.18.x pandas release (#349) 2016-06-18 00:22:35 +02:00
Jeffrey Gerard 0c05c8616c Merge pull request #1 from IamJeffG/259-plotting-collections-rebase
rebase from upstream master
2016-06-17 01:22:46 +02:00
Jeffrey Gerard ea7c484336 Merge remote-tracking branch 'upstream/master' into 259-plotting-collections-rebase
Conflicts:
	geopandas/tests/test_plotting.py
2016-06-16 21:48:21 +02:00
Joris Van den Bossche c780783d1c DOC: fix readthedocs link 2016-06-11 00:04:30 +02:00
Kelsey Jordahl 99a0c31270 Merge pull request #344 from geopandas/readme-update
update README and setup.py
v0.2
2016-06-10 11:35:03 -07:00
Kelsey Jordahl 24bc3dc3a7 Update copyright in docs 2016-06-10 11:33:59 -07:00
Kelsey Jordahl 353f5c5322 DOC: Clarify multiple version on RTD 2016-06-10 10:54:41 -07:00