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
@@ -306,10 +306,10 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
306
306
# as the nested loop above, and iterating through poly_b in order.
307
307
if Extents.intersects(ext_l, ext_b)
308
308
# Loop over the edges in b that might intersect the edges in a
309
-
SpatialTreeInterface.do_query(Base.Fix1(Extents.intersects, ext_l), b_tree) do j
309
+
SpatialTreeInterface.depth_first_search(Base.Fix1(Extents.intersects, ext_l), b_tree) do j
310
310
b1t, b2t = edges_b[j].geom
311
311
b1t == b2t &&return LoopStateMachine.Continue()
312
-
# LoopStateMachine control is managed outside the loop, by the do_query function.
312
+
# LoopStateMachine control is managed outside the loop, by the depth_first_search function.
313
313
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.
314
314
end
315
315
end
@@ -324,7 +324,7 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
324
324
325
325
last_a_idx =0
326
326
327
-
SpatialTreeInterface.do_dual_query(Extents.intersects, tree_a, tree_b) do a_edge_idx, b_edge_idx
327
+
SpatialTreeInterface.dual_depth_first_search(Extents.intersects, tree_a, tree_b) do a_edge_idx, b_edge_idx
328
328
a1t, a2t = edges_a[a_edge_idx].geom
329
329
b1t, b2t = edges_b[b_edge_idx].geom
330
330
@@ -382,7 +382,7 @@ function foreach_pair_of_maybe_intersecting_edges_in_order(
382
382
383
383
last_a_idx =1
384
384
385
-
SpatialTreeInterface.do_dual_query(Extents.intersects, tree_a, tree_b) do a_thinned_idx, b_thinned_idx
385
+
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.
249
+
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.
250
250
pt1, _ = intr1
251
251
push!(result, pt1) # if not line_out, there is at least one intersection point
252
252
if line_orient == line_over # if line_over, there are two intersection points
0 commit comments