wassname/geopandas
1
0 Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-10-01 12:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
571 Commits 19 Branches 4 Tags
a2c8de18e6672d8f424dcd48f54fcf9495c82bd7
Commit Graph
200 Commits
Author SHA1 Message Date
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
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 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
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
Jacob Wasserman be618726af BUG: Fix unary_union for GeoDataFrame 2014-10-13 10:02:53 +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 35c2f5b74c Merge pull request #159 from jwass/mock_geocode_tests 
Mock geocoding network calls.
 2014-09-07 22:33:34 -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
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 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
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
Matthew Perry c4d9aa15f0 spatial joins 2014-07-22 10:31:51 -07:00
Kelsey Jordahl 42b14545e8 Merge pull request #142 from geopandas/overlay 
spatial overlays
 2014-07-22 10:24:37 -07:00
Matthew Perry 99e44fc0b4 No need to use a geoseries 2014-07-21 09:30:30 -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 3384c82f80 first cut at implementing spatial overlays (polygon only) 2014-07-20 13:23:07 -07: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 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 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
Jacob Wasserman a9129a5bcd Add reverse() method to geocode module 
Take a bunch of points and turn them into addresses.
 2014-07-11 23:47:28 -04:00
noraderam 0061fb8df9 TST: Implement skipped geometry tests for GeoSeries 2014-07-11 17:32:15 -05:00
Kelsey Jordahl 196e94e1ab TST CLN: Remove repeated import 2014-07-11 16:11:55 -05:00
Matthew Perry 3a743219db geo interface for geoseries 2014-07-11 15:08:28 -05:00
Matthew Perry f2f94c0d27 preliminary geo interface for geodataframes 2014-07-11 14:34:31 -05:00
Kelsey Jordahl e9755b6332 TST BUG: Arg, geopy import was failing before the python 3.2 test 2014-07-11 10:50:46 -05:00
Kelsey Jordahl 19ef25b9c2 TST BUG: Protect individual geopy dependent imports 2014-07-11 09:31:20 -05:00
Kelsey Jordahl d8c368d52c Revert "TST BUG: Protect failing import for python 3.2 error" 
This reverts commit 9d70950210.
 2014-07-11 09:21:03 -05:00
Kelsey Jordahl c263221880 TST: Skip nominatim test, it times out too often. 2014-07-11 07:58:16 -05:00
Kelsey Jordahl 9d70950210 TST BUG: Protect failing import for python 3.2 error 2014-07-11 07:56:51 -05:00
Kelsey Jordahl ce13a78826 TST: Stupid missing import 2014-07-11 00:12:38 -05:00
Kelsey Jordahl d57e9b1010 TST: Update the tests to use SQLalchemy for new pandas and DB API for older pandas versions 2014-07-10 23:08:41 -05:00
Kelsey Jordahl e3795db7fb TST: Skip geopy tests on python 3.2, as it's known to be broken. 2014-07-10 22:40:08 -05:00
Kelsey Jordahl 353d383d87 ENH: Use sqlalchemy for PostGIS connection for better compatibility with pandas.read_sql 2014-07-10 22:08:15 -05:00
Kelsey Jordahl a8a2ba124d TST: Use a longer timeout for geopy in test 2014-07-10 21:58:24 -05:00