wassname/geopandas
1
0
Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-09-25 13:40:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
571 Commits 19 Branches 4 Tags
a2c8de18e6672d8f424dcd48f54fcf9495c82bd7
Commit Graph
571 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelsey Jordahl a2c8de18e6 BUG: Use index on dataframe, not on values (GH#190) 2015-04-27 23:03:34 -07:00
Kelsey Jordahl c4d56a3093 Merge pull request #173 from adamgreenhall/plot-edge-options 
Plot edge options
 2015-04-12 23:25:14 -07:00
Kelsey Jordahl 74fe12a339 Merge pull request #178 from geopandas/write_schema 
ENH: Allow schema input in to_file()
 2015-04-12 23:23:35 -07:00
Kelsey Jordahl 3ffef9efd9 Merge pull request #188 from mdbartos/spatial_join 
ENH: Optimized spatial join
 2015-04-12 23:22:12 -07:00
Matthew Bartos 2af7022eca Fixed column widths to conform to PEP8. 2015-04-11 16:07:54 -07:00
Matthew Bartos d43d5e37ef Better construction of r_idx 2015-04-11 15:20:21 -07:00
Matthew Bartos 54fc5b43f4 Removed convert_crs. Added lsuffix and rsuffix to docstring. Compliance with PEP8 and contribution guidelines. Changed default join type to inner. 2015-04-09 23:25:26 -07:00
mdbartos 2c5dc65786 Fixed inconsistent indentation 2015-04-04 18:27:12 -07:00
mdbartos 1cdad11679 Removed inaccurate comment. 2015-04-04 17:56:01 -07:00
mdbartos dbe054ab07 Maintained compatibility with old tests. Edited sjoin to maintain python 
3 compatibility.
 2015-04-04 17:38:26 -07:00
mdbartos 17c67d13a2 Marked test file for sources of error 2015-04-04 05:15:28 -07:00
mdbartos 33e9aa5dc7 Optimize sjoin 2015-04-04 03:38:51 -07:00
Jacob Wasserman 72a00fd1a9 Add iterfeatures on GeoDataFrame. Use in to_file. 
Add iterfeatures() method to iterate over rows as feature
dictionaries. Removes some duplicate functionality that was
also bug-prone.

Remove dependency on fiona internals from previous commit.
 2014-12-10 08:14:27 -05:00
Jacob Wasserman 98d7ad5cfe Use fiona.odict.OrderedDict instead of collections 
OrderedDict was introduced in Python 2.7. Fiona uses the
ordereddict module for versions < 2.7. Use fiona.odict rather
than duplicating its effort
 2014-12-02 08:45:53 -05:00
Jacob Wasserman ec53ec77ce ENH: Allow schema input in to_file() 
Add a schema argument in GeoDataFrame.to_file to pass in to Fiona.
Allows for finer control over how the data gets written.

Refactor to_file into geopandas.io.file.
 2014-12-01 19:05:20 -05:00
Adam Greenhall 195d85760d use kwds 2014-11-12 08:46:00 -08:00
Adam Greenhall 73367fba80 add install instructions 2014-11-11 10:15:58 -08:00
Adam Greenhall c6e0617b73 add plot edge options 2014-11-11 09:44:15 -08:00
Kelsey Jordahl cf4eb4ddae Merge pull request #170 from jwass/four_fixes 
Four small fixes
 2014-10-21 21:41:13 -04:00
Jacob Wasserman be618726af BUG: Fix unary_union for GeoDataFrame 2014-10-13 10:02:53 +01:00
Jacob Wasserman 33d72b63ed BUG: interiors should return Series not GeoSeries 
Since interiors returns InteriorRingSequence, we can't really
have it in a GeoSeries here. So return as Series.
 2014-10-13 09:57:46 +01:00
Jacob Wasserman 3f20779237 Use pd.notnull() not bool() 
bool(np.nan) evaluates to True. notnull() should be more of what
we want here.
 2014-10-13 09:57:46 +01:00
Jacob Wasserman 301a26cf1c TST: Assign and index using .loc 
Fix the tests to assign using the loc indexer instead of assigning
to the resulting view. Fixes some pandas warnings.
 2014-10-13 09:57:46 +01:00
Kelsey Jordahl a4a88c7e96 Merge pull request #169 from jwass/no3.2 
Drop support for 3.2
 2014-10-12 18:43:19 -04:00
Jacob Wasserman 01763d35db Drop support for 3.2 2014-10-12 19:31:57 +01:00
Kelsey Jordahl 35c2f5b74c Merge pull request #159 from jwass/mock_geocode_tests 
Mock geocoding network calls.
 2014-09-07 22:33:34 -07:00
Kelsey Jordahl 51ff047592 Merge pull request #158 from jwass/lazy_build_sindex 
ENH: Don't build the spatial index until it's requested
 2014-09-07 22:33:14 -07:00
Jacob Wasserman e6f512517b Mock geocoding network calls. 2014-08-17 21:12:34 -04:00
Jacob Wasserman 02a05376a1 Rename sindex caching method/members 
_reset_sindex() -> _invalidate_sindex()
_sindex_built -> _sindex_valid
 2014-08-17 12:22:25 -04:00
Jacob Wasserman c111f84af0 ENH: Lazily build the spatial index 
Add a new property 'sindex' to GeoSeries and GeoDataFrame. External
functions should use the property to access the spatial index. The
rtree will not be built until the 'sindex' property is accessed.

A member '_sindex_built' is used to indicate if the rtree has been
built or needs to be.
 2014-08-17 00:00:48 -04:00
Kelsey Jordahl cb62e9f80b Merge pull request #157 from jwass/fix_travis 
Fix tests
 2014-08-16 12:22:39 -07:00
Jacob Wasserman 1e0c2ed582 BUG/TST: Fix tests - don't do math on Index 
Treat Index objects as set-like. Convert to Series before doing
arithmetic. This broke when Pandas Index no longer subclassed from
NDArray.
 2014-08-16 12:54:21 -04:00
Jacob Wasserman 94116ceba7 Revert "TST: Disable pandas master tests..." 
This reverts commit 95d2e20fe5.
 2014-08-16 12:53:15 -04:00
Kelsey Jordahl 95d2e20fe5 TST: Disable pandas master tests for python 2.6 and 3.2 2014-08-07 16:33:37 -07:00
Kelsey Jordahl 33651b39ba TST: Lock geopy version ==0.99 2014-08-06 14:25:32 -07:00
Kelsey Jordahl c02291e958 Install libgdal1h from ubuntugis ppa on Travis CI 2014-08-06 13:18:13 -07:00
Kelsey Jordahl cbf604a34b Merge pull request #146 from jwass/explode_collect 
Explode collect
 2014-07-29 21:51:39 -07:00
Jacob Wasserman fb57a6c15a Add tests for collect() 2014-07-29 16:46:27 -04:00
Jacob Wasserman dc05edb4d7 Add explode() and collect() functions 
explode() expands multi-part geometries into multiple rows, and into
their single part geometries.

collect() and take multiple single geometries and combine them into their
Multi* counterparts.
 2014-07-29 16:46:27 -04:00
Kelsey Jordahl 0a82279a57 Merge pull request #148 from jwass/geocoding_tools 
Move geocode.py to tools/geocoding.py
 2014-07-27 20:04:34 -07:00
Jacob Wasserman e453940b3f Remove unused imports. 2014-07-27 21:19:54 -04:00
Jacob Wasserman 93e66eeaef Move geocode.py to tools/geocoding.py 
Move geocoding capability into the tools module.
 2014-07-24 10:51:17 -04:00
Kelsey Jordahl 5219026c99 Merge pull request #145 from geopandas/sjoin 
ENH: Spatial join
 2014-07-22 21:17:43 -07:00
Matthew Perry c707e1f36b add geopandas.tools to setup packages 2014-07-22 10:34:54 -07:00
Matthew Perry bce4903c54 sjoin examples in python notebook 2014-07-22 10:31:51 -07:00
Matthew Perry c4d9aa15f0 spatial joins 2014-07-22 10:31:51 -07:00
Kelsey Jordahl b90fce6bd4 Merge pull request #144 from geopandas/test/updates 
Update CI test versions
 2014-07-22 10:25:06 -07:00
Kelsey Jordahl 42b14545e8 Merge pull request #142 from geopandas/overlay 
spatial overlays
 2014-07-22 10:24:37 -07:00
Kelsey Jordahl 2f3c23275e TST: Re-enable pandas 0.14 on python 2.6 in Travis CI 2014-07-21 22:02:43 -07:00
Kelsey Jordahl 338efdf54b TST: Allow geopy to use 0.99 or greater 2014-07-21 21:56:56 -07:00