You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/methods/clipping/clipping_processor.jl
+4-4Lines changed: 4 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -305,10 +305,10 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
305
305
# as the nested loop above, and iterating through poly_b in order.
306
306
if Extents.intersects(ext_l, ext_b)
307
307
# Loop over the edges in b that might intersect the edges in a
308
-
SpatialTreeInterface.do_query(Base.Fix1(Extents.intersects, ext_l), b_tree) do j
308
+
SpatialTreeInterface.depth_first_search(Base.Fix1(Extents.intersects, ext_l), b_tree) do j
309
309
b1t, b2t = edges_b[j].geom
310
310
b1t == b2t &&return LoopStateMachine.Continue()
311
-
# LoopStateMachine control is managed outside the loop, by the do_query function.
311
+
# LoopStateMachine control is managed outside the loop, by the depth_first_search function.
312
312
returnf_on_each_maybe_intersect(((a1t, a2t), i), ((b1t, b2t), j)) # note the indices_b[j] here - we are using the index of the edge in the original edge list, not the index of the edge in the STRtree.
313
313
end
314
314
end
@@ -323,7 +323,7 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
323
323
324
324
last_a_idx =0
325
325
326
-
SpatialTreeInterface.do_dual_query(Extents.intersects, tree_a, tree_b) do a_edge_idx, b_edge_idx
326
+
SpatialTreeInterface.dual_depth_first_search(Extents.intersects, tree_a, tree_b) do a_edge_idx, b_edge_idx
327
327
a1t, a2t = edges_a[a_edge_idx].geom
328
328
b1t, b2t = edges_b[b_edge_idx].geom
329
329
@@ -381,7 +381,7 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
381
381
382
382
last_a_idx =1
383
383
384
-
SpatialTreeInterface.do_dual_query(Extents.intersects, tree_a, tree_b) do a_thinned_idx, b_thinned_idx
384
+
SpatialTreeInterface.dual_depth_first_search(Extents.intersects, tree_a, tree_b) do a_thinned_idx, b_thinned_idx
line_orient == line_out &&return LoopStateMachine.Continue() # use LoopStateMachine.Continue() to skip this edge - in this case it doesn't matter but you could use it to e.g. break once you found the first intersecting point.
245
+
line_orient == line_out &&return LoopStateMachine.Action(:continue) # use LoopStateMachine.Continue() to skip this edge - in this case it doesn't matter but you could use it to e.g. break once you found the first intersecting point.
246
246
pt1, _ = intr1
247
247
push!(result, pt1) # if not line_out, there is at least one intersection point
248
248
if line_orient == line_over # if line_over, there are two intersection points
0 commit comments