wassname/geopandas
1
0
Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-09-20 12:50:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
535 Commits 19 Branches 4 Tags
cbf604a34b2fffd1126fa7d91e30f754ca8199fb
Commit Graph
535 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kelsey Jordahl df580b8784 TST: Update pandas from 0.14.0 to 0.14.1 on Travis CI 2014-07-21 21:56:25 -07:00
Kelsey Jordahl 7480560c6e DOC CLN: Use %matplotlib magic and set a text cell to markdown style in overlay notebook 2014-07-21 21:48:05 -07:00
Matthew Perry 99e44fc0b4 No need to use a geoseries 2014-07-21 09:30:30 -07:00
Matthew Perry 7a52349382 cleaner way to create index 2014-07-21 09:27:03 -07:00
Matthew Perry cf10076180 explicit relative import 2014-07-21 09:13:40 -07:00
Kelsey Jordahl df6ba0afa7 Merge pull request #137 from geopandas/geojson_bbox 
optionally include bbox in geojson, fixes #131
 2014-07-20 22:28:42 -07:00
Matthew Perry 6e4ea093e5 ordinals in format for sake of py2.6 2014-07-20 13:54:02 -07:00
Matthew Perry 3384c82f80 first cut at implementing spatial overlays (polygon only) 2014-07-20 13:23:07 -07:00
Kelsey Jordahl 5724e57882 Merge pull request #141 from geopandas/issue140 
Spatial index take 2
 2014-07-17 16:45:17 -07:00
Sean Gillies fd7ce72574 Install libspatialindex packages. 2014-07-17 15:00:50 -06:00
Sean Gillies a314b73b0a Pin rtree >= 0.8 2014-07-17 14:43:41 -06:00
Sean Gillies 29bb8b1a15 Add rtree back as a requirement. 2014-07-17 13:09:39 -06:00
Sean Gillies 19ad364926 Towards #140. 
An R-tree for series and frames, with tests.
 2014-07-16 23:32:01 -06:00
Matthew Perry 66ac9b973d optionally include bbox in geojson, fixes #131 2014-07-15 11:13:15 -07:00
Kelsey Jordahl f42d049ae9 Merge pull request #121 from jwass/reverse_geocode 
Add reverse() method to geocode module
 2014-07-15 09:38:42 -07:00
Jacob Wasserman 4b7cedf565 Rename geocode to reverse_geocode 
Following discussion in #121.
 2014-07-15 11:07:40 -04:00
Kelsey Jordahl 822f575b35 Merge pull request #55 from geopandas/feature/coordinate_index 
Add coordinate indexing
 2014-07-13 18:21:37 -07:00
Kelsey Jordahl 11b3ad07f0 Merge branch 'master' into feature/coordinate_index 
Conflicts:
	tests/test_geoseries.py
 2014-07-13 15:54:11 -07:00
Kelsey Jordahl 3b7afba679 Merge pull request #116 from geopandas/geo_interface 
Geo interface
 2014-07-13 17:52:30 -05:00
Kelsey Jordahl 028b8644cb Merge pull request #132 from geopandas/bld/0.2.0-dev 
Set version to 0.2.0-dev
 2014-07-13 17:50:23 -05:00
Kelsey Jordahl ddec2d3690 DOC: Set version in docs 2014-07-13 15:53:16 -06:00
Kelsey Jordahl 280e7cf4f7 BLD: Set default version to 0.2.0.dev-unknown 2014-07-13 15:52:29 -06:00
Kelsey Jordahl 599be2ce99 BLD: Set ISRELEASED = False 2014-07-13 15:50:51 -06:00
Matthew Perry e1da927134 DOC: add geo interface to user guide 2014-07-13 09:07:24 -07:00
Kelsey Jordahl 310b37ec16 Merge pull request #130 from geopandas/doc/release-0.1.0-fix 
Update supported geopy version to 0.99
v0.1.0 		2014-07-12 21:15:00 -05:00
Kelsey Jordahl 055ed0e674 DOC BUG: Update supported geopy version [ci skip] 2014-07-12 21:11:35 -05:00
Kelsey Jordahl 8b5477faf7 Merge pull request #129 from geopandas/doc/new-repo-name 
Update links to new repo name
 2014-07-12 16:09:38 -05:00
Kelsey Jordahl db01277518 DOC BUG: Update links to new repo name 2014-07-12 16:08:29 -05:00
Kelsey Jordahl c82ba65cf3 Merge pull request #106 from geopandas/release/0.1.0 
Release 0.1.0
 2014-07-12 15:30:50 -05:00
Kelsey Jordahl e9127529e2 Merge pull request #123 from geopandas/bug/pandas-sqlalchemy-no-travis 
Use SQLAlchemy engine on pandas >= 0.14.0
 2014-07-12 15:29:40 -05:00
Kelsey Jordahl 04d263ae66 TST BUG: We still need OperationalError import 2014-07-12 13:52:22 -05:00
Kelsey Jordahl 457e8e8b5a TST: Don't depend on OperationalError for exceptions in connecting to test database 2014-07-12 13:07:54 -05:00
Kelsey Jordahl f84bc3892b TST: Don't raise in utility function 2014-07-12 11:11:41 -05:00
Kelsey Jordahl 3c3518b6c9 TST: Skip on OperationalError for newer pandas versions 2014-07-12 10:34:58 -05:00
Kelsey Jordahl 8657684580 Merge branch 'master' into bug/pandas-sqlalchemy-no-travis 
Conflicts:
	requirements.test.txt
 2014-07-12 09:55:50 -05:00
Kelsey Jordahl 9c7ff29d36 Merge branch 'master' into feature/coordinate_index 
Conflicts:
	geopandas/geoseries.py
	tests/test_geoseries.py
 2014-07-12 08:04:43 -05:00