Commit Graph
607 Commits
Author SHA1 Message Date
Maximilian Albert aeac64af5b Add keyword arguments 'vmin', 'vmax' to plot_dataframe() which allow adjusting the min/max value used for the colormap. 2015-07-31 02:37:47 +05:45
Kelsey Jordahl 15f77ba821 Merge pull request #206 from geopandas/bug/pickle-crs
Serialize metadata
2015-07-13 23:09:13 -07:00
Kelsey Jordahl ddf08b7b82 DOC: Add comments to explain serialization [skip ci] 2015-07-13 23:07:30 -07:00
Kelsey Jordahl a71516a034 TST: Test pickling/unpickling CRS 2015-07-12 15:33:02 -05:00
Kelsey Jordahl 66b67d1fbe ENH: Add _metadata to _internal_names to ensure it is deserialized 2015-07-12 15:32:43 -05:00
Kelsey Jordahl 795ea62085 BUG: Make sure that pandas serializes metadata 2015-07-12 15:32:13 -05:00
Kelsey Jordahl 327e84e676 Merge pull request #202 from geopandas/geopy-version
Update geopy version
2015-07-11 14:41:44 -05:00
Kelsey Jordahl c785db0225 TST: pandas 0.16.0 -> 0.16.2 in travis 2015-07-11 13:04:31 -05:00
Kelsey Jordahl 3d3f8a096c CLN: space around operator 2015-07-11 12:30:45 -05:00
Kelsey Jordahl 091f960c8f TST: Add name attribute to test series 2015-07-11 12:30:02 -05:00
Kelsey Jordahl 4b1bd28541 CLN: Remove unused import 2015-07-11 12:11:53 -05:00
Kelsey Jordahl 91dc4dd363 CLN: Remove extra line 2015-07-11 12:11:39 -05:00
Kelsey Jordahl e8d39c6365 TST: Use more current geopy in tests 2015-07-11 11:46:01 -05:00
Kelsey Jordahl 37845786e7 CLN: Remove Mapquest geocoding API (no longer supported upstream) 2015-07-11 11:45:30 -05:00
Kelsey Jordahl 6163bc92ab Merge pull request #194 from geopandas/clean/add-kwarg-null-value
Always use kwargs when calling _series_unary_op()
2015-04-30 15:47:49 -07:00
Kelsey Jordahl bc3dc90f56 CLN: Add kwarg for calls to _series_unary_op() even when using default value of null_value 2015-04-30 08:30:44 -07:00
Kelsey Jordahl d77b129d6c CLN: Make the null_value argument explicit by name when calling _series_unary_op() 2015-04-30 08:29:25 -07:00
Kelsey Jordahl 45748f60f6 Merge pull request #193 from IamJeffG/139-missing-geoms
Handle missing geoms
2015-04-30 08:23:02 -07:00
Kelsey Jordahl 2c883c88d3 Merge pull request #191 from geopandas/bug/sjoin-index
Fix bug in sjoin index
2015-04-29 07:37:32 -07:00
Kelsey Jordahl 15b2b450d0 CLN: Remove redundant comments 2015-04-28 22:13:08 -07:00
Kelsey Jordahl 03a5daccee CLN: Remove unused import and fix whitespace 2015-04-28 22:11:03 -07:00
Kelsey Jordahl e6251da159 CLN: Use apply() rather than str to get len of each element 2015-04-28 22:08:08 -07:00
Kelsey Jordahl a266da5ed6 BUG: avoid use of np.repeat on 32-bit platforms 2015-04-28 22:06:42 -07:00
Kelsey Jordahl 1cc916cc94 Merge pull request #192 from geopandas/test/pandas-ci-versions
Update pandas versions on Travis CI
2015-04-28 21:30:31 -07:00
Kelsey Jordahl a1988eb153 BUG: Fix index on the left side too 2015-04-28 11:56:48 -07:00
Kelsey Jordahl 9d6f81bdb6 TST: Update pandas versions on Travis CI to latest 2 major releases + master 2015-04-27 23:19:50 -07:00
Kelsey Jordahl e22d654ba9 TST: Test for sjoin index bug (GH#190) 2015-04-27 23:03:49 -07:00
Kelsey Jordahl a2c8de18e6 BUG: Use index on dataframe, not on values (GH#190) 2015-04-27 23:03:34 -07:00
Jeffrey Gerard a877938e2c Merge branch 'master' into lucasnad27_null
Conflicts:
	geopandas/geodataframe.py
	tests/test_geodataframe.py

I resolved conflicts and ensured existing tests pass.

I did not check for consistency with any discussions that may have been
made in the interim, around how missing geoms ought to be treated.
2015-04-23 21:47:09 -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