Cartography/prettymaps
1
0
Fork 0
mirror of https://github.com/marceloprates/prettymaps.git synced 2025-08-28 16:50:10 +02:00
Code Issues Projects Releases Wiki Activity

Merged changes from geometry-intersection

Browse Source 
Quite a few merge errors had to be fixed
This commit is contained in:
Colm McDonald
2021-09-06 14:11:15 +01:00
parent 25884a2be5
commit f996e8ea12
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
prettymaps/fetch.py
View File

@@ -46,7 +46,7 @@ def get_coast(perimeter = None, point = None, radius = None, perimeter_tolerance
bbox=bbox.buffer(perimeter_tolerance+dilate+buffer) bbox=bbox.buffer(perimeter_tolerance+dilate+buffer)
bbox=bbox.to_crs(4326) bbox=bbox.to_crs(4326)
bbox=bbox.envelope bbox=bbox.envelope
# Load the polygons for the coastline from a file # Load the polygons for the coastline from a file
geometries = read_file(file_location, bbox=bbox) geometries = read_file(file_location, bbox=bbox)
perimeter = unary_union(ox.project_gdf(perimeter).geometry) perimeter = unary_union(ox.project_gdf(perimeter).geometry)
@@ -86,6 +86,7 @@ def get_geometries(
tags={}, tags={},
perimeter_tolerance=0, perimeter_tolerance=0,
union=True, union=True,
buffer=0,
circle=True, circle=True,
dilate=0, dilate=0,
): ):
@@ -93,8 +94,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,
) )
@@ -104,7 +105,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(
@@ -116,7 +117,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:
geometries = unary_union( geometries = unary_union(
@@ -167,13 +168,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
@@ -189,9 +191,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(
@@ -199,7 +202,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(
@@ -208,7 +211,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
], ],