Merge pull request #3 from mfbehrens99/main

Small Improvements
pull/11/head
Marcelo de Oliveira Rosa Prates 2021-04-09 11:44:49 -03:00 zatwierdzone przez GitHub
commit 7506bf3509
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 11 dodań i 8 usunięć

Wyświetl plik

@ -22,7 +22,7 @@ from geopandas import GeoDataFrame
import pandas as pd
from functools import reduce
from tabulate import tabulate
from IPython.display import Markdown
from IPython.display import Markdown, display
from collections.abc import Iterable
# Fetch
@ -39,7 +39,7 @@ def show_palette(palette, description = ''):
f'![](https://placehold.it/30x30/{c[1:]}/{c[1:]}?text=)'
for c in palette
]
display(Markdown((description)))
display(Markdown(tabulate(pd.DataFrame(colorboxes), showindex = False)))
@ -117,7 +117,8 @@ def plot(
zorder_streets = None,
zorder_building = None,
# Whether to fetch data using OSM Id
by_osmid = False
by_osmid = False,
by_coordinates = False,
):
#############
@ -125,7 +126,9 @@ def plot(
#############
# Geocode central point
if not by_osmid:
if by_coordinates:
point = (float(query.split(",")[0].strip()), float(query.split(",")[1].strip()))
elif not by_osmid:
point = ox.geocode(query)
# Fetch perimeter
@ -179,4 +182,4 @@ def plot(
plot_shapes(layers_dict[layer], ax, **layer_kwargs[layer])
# Return perimeter
return layers_dict['perimeter']
return layers_dict['perimeter']

Wyświetl plik

@ -44,7 +44,7 @@ def get_footprints(perimeter = None, point = None, radius = None, footprint = 'b
# Boundary defined by polygon (perimeter)
footprints = ox.geometries_from_polygon(union(perimeter.geometry), tags = {footprint: True} if type(footprint) == str else footprint)
perimeter = union(ox.project_gdf(perimeter).geometry)
elif (point is not None) and (radius is not None):
# Boundary defined by circle with radius 'radius' around point
footprints = ox.geometries_from_point(point, dist = radius, tags = {footprint: True} if type(footprint) == str else footprint)
@ -100,7 +100,7 @@ def get_streets(perimeter = None, point = None, radius = None, dilate = 6, custo
if not isinstance(streets, Iterable):
streets = [streets]
streets = list(map(pathify, streets))
return streets, perimeter
return streets, perimeter