Commit Graph
533 Commits
Author SHA1 Message Date
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 8db12e6d49 Move overloaded operators to GeoSeries 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
Jacob Wasserman c2ae61ae26 Fixes for calling geometry propery on inputs
Properly calls _geo_op and _series_op getting the 'geometry' property
on all inputs
2013-12-27 11:17:46 -05:00
Jacob Wasserman c15e5b96a8 Enable geometry methods on GeoDataFrame
GeoDataFrame is geometry-enabled by inheriting from GeoPandasBase.
The GeoPandasBase operations get the geometry property from the input.

Move __contains__ back to GeoSeries.
2013-12-27 11:17:46 -05:00
Jacob Wasserman 289a6beeda ENH: First commit at common class for geo ops
Moves the GeoSeries geo-aware ops into a base GeoPandas class.
And gets all tests passing
2013-12-27 11:17:45 -05:00
Jacob Wasserman 6bcffef99f BUG: Require geopy 0.96 in test requirements
Changes in 0.97 break GeoPandas error detection. Until this is properly
handled, this fixes the Travis build.
2013-12-27 11:17:17 -05:00
Kelsey Jordahl 6dab7f6051 Merge pull request #79 from trengrj/master
DOC: Add --pre to pip install
2013-12-03 05:42:32 -08:00
John Trengrove 0bdac7d08a DOC: State pip 1.4 requirement 2013-12-03 21:31:16 +11:00
John Trengrove e53edbbe6d DOC: Add --pre to pip install 2013-11-30 18:06:21 +11:00
Kelsey Jordahl d7b7f4f120 Merge pull request #76 from sjsrey/choro
Choropleth classification schemes
2013-11-29 11:14:28 -08:00
Serge Rey a18c38e671 Isolating pysal integration into one stop function.
Moving duplicative code into function.
2013-11-27 12:25:39 -07:00
Kelsey Jordahl 2d642e0f0e Merge pull request #78 from kjordahl/bug/geopy_0.96
Update for geopy 0.96 compatibility
2013-11-22 04:53:24 -08:00
Kelsey Jordahl 782bac9818 BUG: Use explicit position for format field for 2.6 compatibility 2013-11-21 18:41:48 -06:00
Kelsey Jordahl 0f8a4d97f6 TST: Test for Nominatim geocoder 2013-11-21 18:40:45 -06:00
Kelsey Jordahl 872f47d464 ENH: Honor Nominatim usage policy by throttling requests to 1 per second 2013-11-21 18:40:24 -06:00
Kelsey Jordahl a9d8c80098 ENH: Add support for Nominatim OpenStreetMap server 2013-11-21 18:33:55 -06:00
Kelsey Jordahl 21a0ac473c TST: Tests for googlev3 and openmapquest geocoders 2013-11-21 18:26:40 -06:00
Kelsey Jordahl 69324f5d8b CLN: Use np.nan directly rather than through pandas namespace 2013-11-21 18:26:15 -06:00
Kelsey Jordahl 79f0494c71 CLN: import from_epsg specifically from fiona.crs 2013-11-21 18:25:49 -06:00
Kelsey Jordahl 86b0bb85f6 BUG: Workaround name change for Yahoo API in geopy 2013-11-21 18:25:23 -06:00
Kelsey Jordahl 800339ac43 BUG: geopy 0.96 removed Google Maps v2 API because it has shut down. 2013-11-21 17:47:12 -06:00
Kelsey Jordahl c7cce56024 Merge pull request #77 from kjordahl/feature/py3
A start towards python 3 support
2013-11-20 19:07:09 -08:00
Serge Rey e80127af3a soft dependency for pysal
some simple error handling
2013-11-19 15:59:06 -07:00
Kelsey Jordahl a93c3a904c BLD: Add six to requirements 2013-11-18 22:55:24 -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 28f6b699f7 PY3: Use six.iteritems for iterating over a dictionary 2013-11-18 22:45:00 -06:00
Kelsey Jordahl b91a133818 PY3: Use six.string_types 2013-11-18 22:43:56 -06:00
Kelsey Jordahl 1ad179254a BUG: Use sys.version_info to detect python 3 2013-11-18 22:42:09 -06:00
Kelsey Jordahl c2d5493516 ENH: Protect fiona imports so that they are not required at module level 2013-11-18 22:42:09 -06:00
Kelsey Jordahl 55f43a54ef BUG: Correctly decode git tag in Python 3 (from pandas setup.py) 2013-11-18 22:42:09 -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
Carson Farmer 24bfe85976 update gitignore 2013-11-18 22:29:35 -06:00
Serge Rey 96309e8a6a example choropleths notebook 2013-11-18 15:35:45 -07:00
Serge Rey d7df7cda73 prototyping use of pysal map classifiers for choropleth mapping 2013-11-18 15:25:57 -07:00
Kelsey Jordahl 10d806e01d Merge pull request #72 from jtratner/geo-setitem-tests
TST: Add a few test cases for changing geometries
2013-11-18 11:34:29 -08:00
Kelsey Jordahl 06c335efe3 Merge pull request #66 from jtratner/fix-perf-issue
PERF: Use faster version of list comprehension
2013-11-14 05:56:18 -08:00
Jeff Tratner 0dc6f9e826 PERF: Use faster version of list comprehension
Using index lookups is ~20% slower (and less pythonic) than unpacking
with comprehension. Plus use lazy iterator.
2013-11-14 07:14:35 -05: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 a0e2ad9d6d Merge pull request #67 from kjordahl/test/python_2.6_support
Python 2.6 support
2013-11-13 04:51:25 -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 cae8249421 DOC: Update docs to list supported python versions 2013-11-12 22:58:32 -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