wassname/geopandas
1
0
Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-09-09 11:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
785 Commits 19 Branches 4 Tags
master
Commit Graph
785 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kelsey Jordahl e22e9a5a1b Update copyright date 2016-06-10 10:53:22 -07:00
Kelsey Jordahl 320f7299d7 BLD: Update authos and email 2016-06-10 10:52:43 -07:00
Kelsey Jordahl c305a5aa37 CLN: Remove unused imports 2016-06-10 10:51:18 -07:00
Kelsey Jordahl 7fb7c458a9 DOC: Remove outdated/redundant comment 2016-06-10 10:51:08 -07:00
Kelsey Jordahl 420bbc8595 DOC: Add links to documentation in README 2016-06-10 10:16:35 -07:00
Kelsey Jordahl 8d6af00efd DOC: Remove TODO from README 2016-06-10 10:13:38 -07:00
Kelsey Jordahl 75f74804ca BUG: Use _geometry_column_name in set_geometry() (#342) 
* BUG: Use _geometry_column_name rather than default name

* TST: Add a test for to_crs() with different geometry column name

* TST: Remove assertions that no longer hold for set_geometry()

* TST CLN: simpler to use rename()

* TST: comment instead of docstring for test method
 2016-06-10 10:33:50 +02:00
Kelsey Jordahl 4180b2b526 Merge pull request #313 from jorisvandenbossche/changelog 
Add changelog for v0.2.0
 2016-06-08 21:26:13 -07:00
Kelsey Jordahl 88546ac5ab Merge pull request #341 from jorisvandenbossche/version-doc 
DOC: remove hardcoded version (leftover after #331)
 2016-06-08 21:25:39 -07:00
Joris Van den Bossche 04e450634d DOC: remove hardcoded version (leftover after #331) 2016-06-08 15:13:12 +02:00
Joris Van den Bossche 35403c8fba DOC: disable other formats on readthedocs (for faster build) (#340) 2016-06-08 14:48:11 +02:00
Joris Van den Bossche 6bda8e187f DOC: add overview of overlay methods (#337) 2016-06-08 14:24:16 +02:00
Joris Van den Bossche 7a3d28784f Add sindex / cx to changelog 2016-06-08 13:24:03 +02:00
Kelsey Jordahl 6d3c14c11a Merge pull request #331 from jorisvandenbossche/versioneer 
MNT/BLD: use versioneer
 2016-06-07 21:56:09 -07:00
Joris Van den Bossche 752ab5ddb7 DOC: update docstrings of overlay and sjoin (#336) 2016-06-06 23:52:18 +02:00
Joris Van den Bossche 035c314751 TST: explicitly skip tests that fail with master version of matplotlib (#327) 2016-06-06 01:00:19 +02:00
Nick Eubank dc4b548696 final doc updates (#328) 2016-05-31 16:56:17 +02:00
Joris Van den Bossche 9344ddb7ac DOC: add rtree and pysal to doc requirements (needed for new mapping and merging docs) (#332) 2016-05-31 12:58:52 +02:00
Joris Van den Bossche dd815ac9d1 MNT/BLD: use versioneer 2016-05-31 12:04:12 +02:00
Joris Van den Bossche 659858d911 Add changelog for v0.2.0 2016-05-28 00:23:58 +02:00