Commit Graph
13 Commits
Author SHA1 Message Date
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
Jacob Wasserman be618726af BUG: Fix unary_union for GeoDataFrame 2014-10-13 10:02:53 +01:00
Luke ce56406e82 Added test_distance which checks a GeoSeries vs a single point and a GeoSeries
vs a Geoseries.
2014-08-11 15:19:06 -07:00
Luke f39b8fb309 Added null geometry test to test_length 2014-08-07 15:31:51 -07:00
Luke 9c6b257562 Added back original test data to test_area along with new null geometry test. 2014-08-07 12:06:26 -07:00
Luke 2de825f79d Null geometries return nan area 2014-08-07 10:39:26 -07: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
noraderam 0061fb8df9 TST: Implement skipped geometry tests for GeoSeries 2014-07-11 17:32:15 -05:00
Kelsey Jordahl 10722da48e PY3: Use explicit relative imports in tests 2014-04-15 18:12:09 -04:00
Kelsey Jordahl f6325fb772 PY3: Use string.ascii_lowercase for compatibility and locale independence 2014-04-15 17:59:08 -04:00
Jacob Wasserman aab741e4e3 Re-enable operator overload tests for GeoSeries. 2013-12-27 11:17:46 -05:00
Jacob Wasserman 0f1debae99 Rename equals methods to geom_equals
Renames on GeoPandasBase:
* equals() -> geom_equals()
* almost_equals() -> geom_almost_equals()
* equals_exact() -> geom_equals_exact()
2013-12-27 11:17:46 -05:00
Jacob Wasserman 1f6dfbde17 Move tests to test_geom_methods.py
For geometry tests, test both the GeoSeries and GeoDataFrame versions.

If the method's input is also a GeoSeries, test the input for both
GeoSeries and GeoDataFrame as well.

For example, for intersects(), test the following combination of inputs:
GeoSeries, GeoSeries,
GeoDataFrame, GeoSeries,
GeoSeries, GeoDataFrame,
GeoDataFrame, GeoDataFrame

Helper functions are provided to test all combinations
2013-12-27 11:17:46 -05:00