From 4b7cedf56599795edea067c7519d4112d917dfac Mon Sep 17 00:00:00 2001 From: Jacob Wasserman Date: Tue, 15 Jul 2014 11:07:40 -0400 Subject: [PATCH] Rename geocode to reverse_geocode Following discussion in #121. --- geopandas/geocode.py | 6 +++--- tests/test_geocode.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/geopandas/geocode.py b/geopandas/geocode.py index 04b39b7..ca30066 100644 --- a/geopandas/geocode.py +++ b/geopandas/geocode.py @@ -62,7 +62,7 @@ def geocode(strings, provider='googlev3', **kwargs): return _query(strings, True, provider, **kwargs) -def reverse(points, provider='googlev3', **kwargs): +def reverse_geocode(points, provider='googlev3', **kwargs): """ Reverse geocode a set of points and get a GeoDataFrame of the resulting addresses. @@ -93,8 +93,8 @@ def reverse(points, provider='googlev3', **kwargs): Example ------- - >>> df = reverse([Point(-71.0594869, 42.3584697), - Point(-77.0365305, 38.8977332)]) + >>> df = reverse_geocode([Point(-71.0594869, 42.3584697), + Point(-77.0365305, 38.8977332)]) address \ 0 29 Court Square, Boston, MA 02108, USA diff --git a/tests/test_geocode.py b/tests/test_geocode.py index bfdc37e..fafcc43 100644 --- a/tests/test_geocode.py +++ b/tests/test_geocode.py @@ -8,7 +8,7 @@ from shapely.geometry import Point import geopandas as gpd import nose -from geopandas.geocode import geocode, reverse, _prepare_geocode_result +from geopandas.geocode import geocode, reverse_geocode, _prepare_geocode_result from .util import unittest @@ -78,7 +78,7 @@ class TestGeocode(unittest.TestCase): def test_bad_provider_reverse(self): with self.assertRaises(ValueError): - reverse(['cambridge, ma'], 'badprovider') + reverse_geocode(['cambridge, ma'], 'badprovider') def test_googlev3_forward(self): from geopandas.geocode import geocode @@ -87,7 +87,7 @@ class TestGeocode(unittest.TestCase): def test_googlev3_reverse(self): from geopandas.geocode import geocode - g = reverse(self.points, provider='googlev3', timeout=2) + g = reverse_geocode(self.points, provider='googlev3', timeout=2) self.assertIsInstance(g, gpd.GeoDataFrame) def test_openmapquest_forward(self):