Skip to content

Update STRtree api to shapely 2.0 #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robbievanleeuwen merged 2 commits into from
Dec 29, 2022
Merged

Update STRtree api to shapely 2.0 #261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bad00e
Update STRtree api to shapely 2.0
normanrichardson Dec 28, 2022
bb58e4b
blackify
normanrichardson Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions sectionproperties/analysis/section.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ def __init__(
Polygon(self.geometry.mesh["vertices"][tri][0:3])
for tri in self.geometry.mesh["triangles"]
]
self.poly_mesh_idx = dict((id(poly), i) for i, poly in enumerate(p_mesh))
self.mesh_search_tree = STRtree(p_mesh)

# initialise class storing section properties
Expand Down Expand Up @@ -2259,11 +2258,7 @@ def get_stress_at_points(

for pt in pts:
query_geom = Point(pt)
tri_ids = [
self.poly_mesh_idx[id(poly)]
for poly in self.mesh_search_tree.query(query_geom) # TODO
if poly.intersects(query_geom)
]
tri_ids = self.mesh_search_tree.query(query_geom, predicate="intersects")
if len(tri_ids) == 0:
sig = None
elif len(tri_ids) == 1:
Expand Down