From 4bad00ede4bda70fd2494a8c186b7021a38dc6f1 Mon Sep 17 00:00:00 2001 From: Norman JN Richardson Date: Tue, 27 Dec 2022 17:36:52 -0800 Subject: [PATCH 1/2] Update STRtree api to shapely 2.0 --- sectionproperties/analysis/section.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sectionproperties/analysis/section.py b/sectionproperties/analysis/section.py index 195b6ff9..27367dd8 100644 --- a/sectionproperties/analysis/section.py +++ b/sectionproperties/analysis/section.py @@ -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 @@ -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: From bb58e4bcc67955d596f12264998e47d89e60600f Mon Sep 17 00:00:00 2001 From: Norman JN Richardson Date: Tue, 27 Dec 2022 17:56:24 -0800 Subject: [PATCH 2/2] blackify --- sectionproperties/analysis/section.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sectionproperties/analysis/section.py b/sectionproperties/analysis/section.py index 27367dd8..d3d36668 100644 --- a/sectionproperties/analysis/section.py +++ b/sectionproperties/analysis/section.py @@ -2258,7 +2258,7 @@ def get_stress_at_points( for pt in pts: query_geom = Point(pt) - tri_ids = self.mesh_search_tree.query(query_geom, predicate="intersects" ) + tri_ids = self.mesh_search_tree.query(query_geom, predicate="intersects") if len(tri_ids) == 0: sig = None elif len(tri_ids) == 1: