Commit Graph
318 Commits
Author SHA1 Message Date
Kelsey Jordahl d080911c04 Merge pull request #64 from jwass/crstest
Crstest
2013-11-11 18:36:49 -08:00
Kelsey Jordahl f6e545cdde Merge pull request #63 from jwass/travis-fix
Fix travis CI build
2013-11-11 17:26:36 -08:00
Jacob Wasserman b557e44c3c Fix tests to include crs when comparing GeoSeries 2013-11-11 19:21:13 -05:00
Jacob Wasserman 37377cf9ea TST: Add check_crs flag to assert_geoseries_equal 2013-11-11 19:21:13 -05:00
Jacob Wasserman b94e805b0a Fix travis CI build
Use ubuntugis stable.
2013-11-11 19:00:00 -05:00
Kelsey Jordahl 2883bea127 Merge pull request #61 from kjordahl/bug/setup_package_io
BUG: Add io to the packages list
2013-11-08 20:04:18 -08:00
Kelsey Jordahl 52c718896f BUG: Add io to the packages list 2013-11-08 22:49:40 -05:00
Kelsey Jordahl 40ec104552 Merge pull request #60 from jtratner/be-flexible-with-geometry-column
Allow arbitrary geo col name and add set_geometry method to DataFrame
2013-11-07 04:55:47 -08:00
Jeff Tratner ec15621c1e CLN: crs set order: passed in, passed Series, DataFrame. 2013-11-06 20:18:10 -05:00
Jeff Tratner 9a35c2e5c6 ENH: Add set_dataframe method to DataFrame 2013-11-05 22:55:25 -05:00
Jeff Tratner c51add2456 Allow setting of crs in set_geometry 2013-11-05 22:37:11 -05:00
Jeff Tratner 799f6a2eb7 Only define name 'geometry' in one place 2013-11-05 22:34:41 -05:00
Jeff Tratner 6eb617b9dd Changeup tests to reflect drop=False default 2013-11-05 22:28:03 -05:00
Jeff Tratner b014e4f0ff ENH: Allow more flexibility with geometries 2013-11-05 22:11:24 -05:00
Kelsey Jordahl 6c816f0fff Merge pull request #59 from jtratner/skip-and-guard-geopy
TST/CLN: Guard geopy import and add skip tests if no geopy.
2013-11-05 18:44:42 -08:00
Kelsey Jordahl b4f772d638 Merge pull request #58 from kjordahl/bug/cached_total_bounds
BUG: cached total_bounds don't reset if values are changed
2013-11-05 18:38:38 -08:00
Kelsey Jordahl 0695518621 Merge pull request #54 from jtratner/change-geometry-v2
ENH: Allow geometry property to be set.
2013-11-05 18:38:16 -08:00
Jeff Tratner 4b4d93f9a5 TST: Fix setattr issue with geometry property and more edge case tests 2013-11-05 07:08:39 -05:00
Jeff Tratner b759222241 TST/CLN: Guard geopy import and add skip tests if no geopy. 2013-11-04 23:36:32 -05:00
Jeff Tratner 69aa0364e0 Add assert_geoseries_equal test util 2013-11-04 00:31:36 -05:00
Jeff Tratner f96fd89557 TST: Move geom_equals and geom_almost_equals to tests/util and use them 2013-11-04 00:31:28 -05:00
Jeff Tratner 7df6db234f ENH: Allow geometry property to be set.
* Allows for clearer errors when a GeoDataFrame is created but has no
  geometry.
* TST: Add test util for comparing sequence (b/c assert_almost_equal seems
  to not work with shapely.
2013-11-04 00:31:12 -05:00
Kelsey Jordahl 7d326c1d68 Merge pull request #57 from jtratner/use-absolute-imports
CLN: Use absolute imports in __init__ + add to namespace for interactive work
2013-11-03 18:55:43 -08:00
Kelsey Jordahl 20b0d62056 TST: Test for total_bounds proprty if values in series change 2013-11-03 21:45:59 -05:00
Kelsey Jordahl 0ee9f4df94 BUG: @cache_readonly didn't reset if series values changed. Reverting to @property. 2013-11-03 21:45:36 -05:00
Jeff Tratner d5add6cbc4 CLN: Use absolute imports in __init__ + add to namespace for interactive work 2013-11-03 16:57:19 -05:00
Kelsey Jordahl 120828c6a0 Merge pull request #49 from kjordahl/feature/update_pandas_api
Update GeoPandas objects to new pandas API
2013-11-02 11:03:53 -07:00
Kelsey Jordahl 9b4496dd09 Merge pull request #50 from jwass/geojson_omitna
Add omitna option to GeoDataFrame.to_json
2013-11-02 11:01:06 -07:00
Jacob Wasserman 0e671667b0 ENH: Introduce method to handle NaNs in to_json()
This adds an 'na' option specifying how NaN values should be handled in
GeoDataFrame's to_json(). The default is 'null' which outputs JSON null.
The other options are 'drop' which removes any missing property, and 'keep'
which will output them as NaN.
2013-11-01 12:58:47 -04:00
Kelsey Jordahl 65c2e0d99c Merge pull request #48 from cfarmer/bounds
Update `total_bounds` based on comments from @jwass on initial PR.
2013-11-01 06:31:05 -07:00
Kelsey Jordahl b1dd61a569 TST: Skip groupby test in pandas 0.12; add fillna test asserts 2013-11-01 08:43:57 -04:00
Kelsey Jordahl 3f68f8208a BUG: Fix breakage on pandas <= 0.12 2013-11-01 08:42:24 -04:00
Jacob Wasserman 72153f4c3b Add omitna option to GeoDataFrame.to_json
When omitna is true, any properties that are NaN will not be written out.
This means that different features can have different numbers of properties,
which is okay for GeoJSON. Writing out NaN values is not valid JSON and causes
problems for some parsers.
2013-11-01 02:29:18 -04:00
Kelsey Jordahl 885cabdf79 TST: Enable groupby test 2013-10-30 23:21:19 -04:00
Kelsey Jordahl 0ff85f3f63 TST: fillna needs argument now, and takes method argument 2013-10-30 22:31:15 -04:00
Kelsey Jordahl fa48e48069 ENH: Define new _constructor property for GeoPandas objects
Special fillna method is no longer needed for recent pandas versions.
     Need an extra check in __getitem__ to return a DataFrame if no geometry
2013-10-30 22:29:58 -04:00
Kelsey Jordahl 1b77106b0d TST: re-enable skipped tests 2013-10-30 20:53:03 -04:00
Kelsey Jordahl ff5f9820f4 ENH: Use new __finalize__ method in GeoDataFrame too 2013-10-30 19:56:42 -04:00
Kelsey Jordahl 612208249b ENH: Use new pandas __finalize__ method 2013-10-30 18:17:23 -04:00
Carson Farmer 3e33e27642 Update total_bounds based on comments from @jwass on initial PR. 2013-10-30 10:40:06 -04:00
Kelsey Jordahl 5ca153c582 Merge pull request #43 from kjordahl/feature/plot_testing
Plot testing
2013-10-30 06:21:18 -07:00
Kelsey Jordahl cccf936d78 Merge pull request #47 from jwass/set_geometry
ENH: Add geometry property to GeoDataFrame
2013-10-30 05:31:32 -07:00
Kelsey Jordahl 8b48370386 Merge pull request #46 from jwass/skip_head_tail_test
Skip the type tests for head and tail
2013-10-30 05:10:54 -07:00
Jacob Wasserman ae27e9775a Skip the type tests for head and tail
Pandas commit c6d07a8 uses iloc for head and tail, which cause these
tests to fail. Skip them. The test for iloc is already being skipped.
2013-10-30 02:28:21 -04:00
Jacob Wasserman 43616470e7 ENH: Add geometry property to GeoDataFrame
Adds a geometry property and set_geometry() method to GeoDataFrame. This was
suggested in Issue #45. The implementation mimics that of DataFrame's
set_index in that it returns a copy of the GeoDataFrame by default with the
new geometry. You can specify a column or give a list/ndarray of geometries.
2013-10-30 02:17:27 -04:00
Kelsey Jordahl d52cfe05df TST: Add baseline images 2013-10-29 19:35:02 -04:00
Kelsey Jordahl 152055a011 TST: Better aspect ratio for lines plot 2013-10-29 19:34:24 -04:00
Kelsey Jordahl c81a1e53af BUG: plot_multilinestring doesn't take alpha parameter 2013-10-29 19:32:18 -04:00
Kelsey Jordahl ee9a89d9ca TST: Add tests for plotting points and lines 2013-10-29 19:31:41 -04:00
Kelsey Jordahl 78e9935458 TST: Refactor plot test to put repetitive code in helper methods 2013-10-29 19:17:29 -04:00