Commit Graph
185 Commits
Author SHA1 Message Date
Kelsey Jordahl f6325fb772 PY3: Use string.ascii_lowercase for compatibility and locale independence 2014-04-15 17:59:08 -04:00
Kelsey Jordahl f2867118dc PY3: Use explicit list in test 2014-04-15 17:57:26 -04:00
Kelsey Jordahl 120d5eebe5 Merge pull request #96 from jwass/from_features_fix
BUG: Fix from_features to align properties
2014-03-27 07:50:21 -04:00
Kelsey Jordahl 01a179e6f8 Merge pull request #95 from kjordahl/bug/unhexify
Use unhexify for python 3 compatibility
2014-03-27 07:43:49 -04:00
Jacob Wasserman 02cab384bd BUG: Fix from_features to align properties
This fixes a longstanding bug starting in read_file() that was migrated to
GeoDataFrame.from_features() which wouldn't align features with their
associated rows.
2014-03-26 23:47:12 -04:00
Kelsey Jordahl 5ef391198a PY3: Use six library to import urlopen for 2/3 compatibility 2014-03-26 20:38:07 -04:00
Kelsey Jordahl 11a6992e67 Merge pull request #94 from kjordahl/bug/no-long-type
Always use 'int' in Fiona schema
2014-03-26 20:27:26 -04:00
Kelsey Jordahl f443cc7d78 TEST: Test that checks various numpy int types as columns when writing to file 2014-03-25 22:23:24 -04:00
Jacob Wasserman 04dfaf9a10 BUG: Align index if set_geometry input is Series
If DataFrame's set_geometry() is called with a Series, align
the index.
2014-03-24 00:46:10 -04:00
Jacob Wasserman f0108b922b BUG: Use _geometry_column_name in to_json()
Fixes a bug in to_json() when the geometry column is not named
'geometry'.
2014-03-01 11:45:19 -05:00
Jacob Wasserman 47f25eea93 BUG: Set crs in read_file
Fixes a bug introduced in 72f236.
2014-01-22 11:35:57 -05:00
Jacob Wasserman 72f236d3df Add from_features constructor for GeoDataFrame.
Allows passing a list of features or objects that implement
__geo_interface__ for easier GeoDataFrame construction.
2014-01-17 10:54:20 -05: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
Kelsey Jordahl 0f8a4d97f6 TST: Test for Nominatim geocoder 2013-11-21 18:40:45 -06:00
Kelsey Jordahl 21a0ac473c TST: Tests for googlev3 and openmapquest geocoders 2013-11-21 18:26:40 -06:00
Kelsey Jordahl f35ad1e972 TST: Import from_epsg explicitly in tests 2013-11-18 22:45:00 -06:00
Kelsey Jordahl 559e5f608c TST: Invoke unittest.main as script for test_geoseries 2013-11-18 22:45:00 -06:00
Kelsey Jordahl e45bc1d098 TST: Clean up the rebase and use assertRaises context manager in test 2013-11-18 22:34:33 -06:00
Carson Farmer a19e12ce99 fix typo in test name 2013-11-18 22:31:20 -06:00
Carson Farmer a99b759ba4 fix typo in test name 2013-11-18 22:31:20 -06:00
Carson Farmer bb4b7f68db BUG: Check that set_geometry will set valid geometry column 2013-11-18 22:31:20 -06:00
Jeff Tratner f33d8859a7 TST: Add a few test cases for changing geometries 2013-11-14 06:52:32 -05:00
Kelsey Jordahl 40b32dbe5d Merge pull request #70 from jwass/singlegeomfix
BUG: Fix GeoSeries constructor for multi geoms
2013-11-13 05:21:43 -08:00
Kelsey Jordahl b1ced78b16 BUG: Put back crs arguments that my merge had overwritten 2013-11-12 23:09:58 -05:00
Kelsey Jordahl 159d69e1e0 TST: Explicitly use relative imports and clean up tests 2013-11-12 22:58:31 -05:00
Kelsey Jordahl 85365657d7 TST: Use local unittest for python 2.6 compatability in test_types 2013-11-12 22:56:18 -05:00
Kelsey Jordahl 2008b33074 Revert "TST: unittest2 didn't like skipIf"
This reverts commit e70ea78321749b8229fdfd1b359b050af1c25a34.
2013-11-12 22:56:18 -05:00
Kelsey Jordahl eb4e198e81 TST: Use local unittest for python 2.6 compatability in test_geocode 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 266f30f222 TST: unittest2 didn't like skipIf 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 30576cf090 BUG: format statements need a position in python 2.6 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 249380ee69 TST: Clean up tests with assertRaises context manager. 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 17d933c04a TST: Attempt to import unittest2 if running python 2.6 2013-11-12 22:56:17 -05:00
Jacob Wasserman bb58ce7c35 TST: Test GeoSeries constructor with index
Make sure that when a single geometry is passed in and the index contains
multiple elements, the geometry is replicated in the GeoSeries.

As suggested by @jtratner in Issue #70.
2013-11-12 22:17:44 -05:00
Jacob Wasserman 1cacbf5f70 BUG: Fix GeoSeries constructor for multi geoms
Because Multi* geometries are iterable, they get expanded when passed into
np.array(). Protect against this by passing in all base geometries as a
single element list. They will not be expanded into their individual
parts.

Switch on older versions of pandas when Series overrode __new__ instead
of __init__.
2013-11-12 22:17:33 -05: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
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
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