Merge branch 'master' into develop

Author: AtelierLibre

osmuf/core.py

@@ -288,7 +288,10 @@ def gen_gross_city_blocks(street_graph, net_city_blocks=None):
     # reindex the columns
     gross_city_blocks = gross_city_blocks.reindex(columns=['city_block_id', 'place', 'geometry'])
     # delete the index name
-    # del gross_city_blocks.index.name
+    try:
+        del gross_city_blocks.index.name
+    except AttributeError:
+        pass
 
     return gross_city_blocks
 
@@ -353,7 +356,7 @@ def project_measure_gdf(gdf):
     GeoDataFrame
     """
     # use osmnx to project gdf to UTM
-    gdf_proj = ox.project_gdf(gdf)
+    gdf_proj = ox.projection.project_gdf(gdf)
     # write perimeter length into column
     gdf_proj['perimeter_m'] = gdf_proj.length
     # write area into column
@@ -683,7 +686,7 @@ def join_places_building_data(places_proj, buildings_proj):
     building_areas_by_place=buildings_proj[['footprint_m2','total_GEA_m2']].groupby(buildings_proj['city_block_id']).sum()
     # if there are buildings not associated with a city_block they aggregate under 0
     # if this happens remove them from the dataframe
-    if 0 in building_areas_by_place.index:#building_areas_by_place.index.contains(0):
+    if 0 in building_areas_by_place.index:
         building_areas_by_place = building_areas_by_place.drop([0])
 
     places_proj = places_proj.merge(building_areas_by_place, on = 'city_block_id')

osmuf/plot.py

@@ -26,9 +26,8 @@
 from descartes import PolygonPatch
 
 from osmnx import settings
-# from osmnx import save_and_show
+from osmnx.plot import _save_and_show as save_and_show
 from osmnx.utils import log
-# from osmnx.utils import make_str
 
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm

osmuf/utils.py

@@ -88,7 +88,7 @@ def gdf_convex_hull(gdf):
 
     # project gdf back to geographic coordinates as footprints_from_polygon
     # requires it
-    gdf_temp = ox.project_gdf(gdf, to_latlong=True)
+    gdf_temp = ox.projection.project_gdf(gdf, to_latlong=True)
     # determine the boundary polygon to fetch buildings within
     # buffer originally 0.000225, buffer actually needs to go whole block away
     # to get complete highways therefor trying 0.001