Cartography/prettymaps
1
0
Fork 0
mirror of https://github.com/marceloprates/prettymaps.git synced 2025-03-15 10:59:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from G21-Goose/main

Browse Source 
Fix geometry-perimeter intersection Supersedes #48
This commit is contained in:
Marcelo de Oliveira Rosa Prates 2021-09-13 16:43:04 -03:00 committed by GitHub
commit 649d2d9c5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
prettymaps/fetch.py
View File

@ -164,8 +164,8 @@ def get_geometries(
if perimeter is not None: if perimeter is not None:
# Boundary defined by polygon (perimeter) # Boundary defined by polygon (perimeter)
geometries = ox.geometries_from_polygon( geometries = ox.geometries_from_polygon(
unary_union(perimeter.geometry).buffer(perimeter_tolerance) unary_union(perimeter.to_crs(3174).buffer(buffer+perimeter_tolerance).to_crs(4326).geometry)
if perimeter_tolerance > 0 if buffer >0 or perimeter_tolerance > 0
else unary_union(perimeter.geometry), else unary_union(perimeter.geometry),
tags={tags: True} if type(tags) == str else tags, tags={tags: True} if type(tags) == str else tags,
) )
@ -175,7 +175,7 @@ def get_geometries(
# Boundary defined by circle with radius 'radius' around point # Boundary defined by circle with radius 'radius' around point
geometries = ox.geometries_from_point( geometries = ox.geometries_from_point(
point, point,
dist=radius + dilate, dist=radius + dilate + buffer,
tags={tags: True} if type(tags) == str else tags, tags={tags: True} if type(tags) == str else tags,
) )
perimeter = get_boundary( perimeter = get_boundary(
@ -187,7 +187,7 @@ def get_geometries(
geometries = ox.project_gdf(geometries) geometries = ox.project_gdf(geometries)
# Intersect with perimeter # Intersect with perimeter
geometries = geometries.intersection(perimeter) geometries = geometries.intersection(perimeter).buffer(0)
if union: if union:
polys = unary_union( polys = unary_union(
@ -267,13 +267,14 @@ def get_streets(
if perimeter is not None: if perimeter is not None:
# Fetch streets data, project & convert to GDF # Fetch streets data, project & convert to GDF
streets = ox.graph_from_polygon( streets = ox.graph_from_polygon(
unary_union(perimeter.geometry).buffer(buffer) unary_union(perimeter.to_crs(3174).buffer(buffer).to_crs(4326).geometry)
if buffer > 0 if buffer > 0
else unary_union(perimeter.geometry), else unary_union(perimeter.geometry),
custom_filter=custom_filter, custom_filter=custom_filter,
) )
streets = ox.project_graph(streets) streets = ox.project_graph(streets)
streets = ox.graph_to_gdfs(streets, nodes=False) streets = ox.graph_to_gdfs(streets, nodes=False)
perimeter = unary_union(ox.project_gdf(perimeter).geometry)
# Boundary defined by polygon (perimeter) # Boundary defined by polygon (perimeter)
elif (point is not None) and (radius is not None): elif (point is not None) and (radius is not None):
# Fetch streets data, save CRS & project # Fetch streets data, save CRS & project
@ -289,9 +290,10 @@ def get_streets(
perimeter = get_boundary(point, radius, crs, circle=circle, dilate=dilate) perimeter = get_boundary(point, radius, crs, circle=circle, dilate=dilate)
# Convert to GDF # Convert to GDF
streets = ox.graph_to_gdfs(streets, nodes=False) streets = ox.graph_to_gdfs(streets, nodes=False)
# Intersect with perimeter & filter empty elements
streets.geometry = streets.geometry.intersection(perimeter) # Intersect with perimeter & filter empty elements
streets = streets[~streets.geometry.is_empty] streets.geometry = streets.geometry.intersection(perimeter)
streets = streets[~streets.geometry.is_empty]
if type(width) == dict: if type(width) == dict:
streets = unary_union( streets = unary_union(
@ -299,7 +301,7 @@ def get_streets(
# Dilate streets of each highway type == 'highway' using width 'w' # Dilate streets of each highway type == 'highway' using width 'w'
MultiLineString( MultiLineString(
streets[ streets[
(streets[layer] == highway) [highway in value for value in streets[layer]]
& (streets.geometry.type == "LineString") & (streets.geometry.type == "LineString")
].geometry.tolist() ].geometry.tolist()
+ list( + list(
@ -308,7 +310,7 @@ def get_streets(
[ [
list(lines) list(lines)
for lines in streets[ for lines in streets[
(streets[layer] == highway) [highway in value for value in streets[layer]]
& (streets.geometry.type == "MultiLineString") & (streets.geometry.type == "MultiLineString")
].geometry ].geometry
], ],