replace gdf_from_place with geocode_to_gdf

gboeing · Jun 20, 2020 · e039471 · e039471
1 parent dbf5f3e
commit e039471
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/osmnx/_api.py b/osmnx/_api.py
@@ -1,7 +1,8 @@
 """Expose the core OSMnx API."""
 
-from . import boundaries
 from .bearing import add_edge_bearings
+from .boundaries import gdf_from_place
+from .boundaries import gdf_from_places
 from .distance import get_nearest_edge
 from .distance import get_nearest_edges
 from .distance import get_nearest_node
@@ -14,9 +15,8 @@
 from .footprints import footprints_from_place
 from .footprints import footprints_from_point
 from .footprints import footprints_from_polygon
-from .geocoding import gdf_from_place
-from .geocoding import gdf_from_places
 from .geocoding import geocode
+from .geocoding import geocode_to_gdf
 from .graph import graph_from_address
 from .graph import graph_from_bbox
 from .graph import graph_from_place

diff --git a/osmnx/footprints.py b/osmnx/footprints.py
@@ -464,7 +464,7 @@ def footprints_from_place(place, footprint_type="building", retain_invalid=False
     You can configure the Overpass server timeout, memory allocation, and
     other custom settings via ox.config().
     """
-    city = geocoding.gdf_from_place(place, which_result=which_result)
+    city = geocoding.geocode_to_gdf(place, which_result=which_result)
     polygon = city["geometry"].iloc[0]
     return footprints_from_polygon(polygon, footprint_type, retain_invalid)
 

diff --git a/osmnx/graph.py b/osmnx/graph.py
@@ -324,12 +324,12 @@ def graph_from_place(
     if isinstance(query, (str, dict)):
         # if it is a string (place name) or dict (structured place query), then
         # it is a single place
-        gdf_place = geocoding.gdf_from_place(
+        gdf_place = geocoding.geocode_to_gdf(
             query, which_result=which_result, buffer_dist=buffer_dist
         )
     elif isinstance(query, list):
         # if it is a list, it contains multiple places to get
-        gdf_place = geocoding.gdf_from_places(query, buffer_dist=buffer_dist)
+        gdf_place = geocoding.geocode_to_gdf(query, buffer_dist=buffer_dist)
     else:
         raise TypeError("query must be dict, string, or list of strings")
 

diff --git a/osmnx/pois.py b/osmnx/pois.py
@@ -475,7 +475,7 @@ def pois_from_place(place, tags, which_result=1):
     You can configure the Overpass server timeout, memory allocation, and
     other custom settings via ox.config().
     """
-    city = geocoding.gdf_from_place(place, which_result=which_result)
+    city = geocoding.geocode_to_gdf(place, which_result=which_result)
     polygon = city["geometry"].iloc[0]
     return pois_from_polygon(polygon, tags)