Fix/issue 1410 repair dissolve #1411
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -178,73 +178,89 @@ struct traverse_graph | |
| bool continue_traverse(Ring& ring, | ||
| signed_size_type component_id, | ||
| signed_size_type start_node_id, | ||
| signed_size_type target_node_id) | ||
| { | ||
| signed_size_type current_node_id = target_node_id; | ||
|
|
||
| std::size_t iteration_count = 0; | ||
|
|
||
| // Keep traversing until it finds the start (successful finish), or it is stuck, | ||
| // or it find an already visited node during traversal. | ||
| // The iteration count is a defensive check to prevent endless loops and not iterate | ||
| // more than times there are turns (this should not happen). | ||
| while (iteration_count < m_turns.size()) | ||
| { | ||
| auto const current_turn_indices = get_turn_indices_by_node_id(m_turns, m_clusters, | ||
| current_node_id, allow_closed); | ||
|
|
||
| // Any valid node should always deliver at least one turn | ||
| BOOST_ASSERT(! current_turn_indices.empty()); | ||
|
|
||
| auto const next_target_nodes = get_target_nodes<target_operation>(m_turns, m_clusters, | ||
| current_turn_indices, component_id); | ||
|
|
||
| if (next_target_nodes.empty()) | ||
| { | ||
| #if defined(BOOST_GEOMETRY_DEBUG_TRAVERSE_GRAPH) | ||
| std::cout << "Stuck, start: " << start_node_id | ||
| << " stuck: " << current_node_id | ||
| << " (no targets) " << std::endl; | ||
| #endif | ||
| return false; | ||
| } | ||
|
|
||
| auto const tois = get_tois<target_operation>(m_turns, m_clusters, | ||
| current_node_id, next_target_nodes); | ||
|
|
||
| if (tois.empty()) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| auto const& turn_point = m_turns[*current_turn_indices.begin()].point; | ||
|
|
||
| auto toi = *tois.begin(); | ||
|
|
||
| if (tois.size() > 1) | ||
| { | ||
| // Select the best target edge, using the last point of the ring and the turn point | ||
| // for side calculations (if any). | ||
| toi = m_edge_selector.select_target_edge(tois, ring.back(), turn_point); | ||
| } | ||
|
|
||
| if (m_visited_tois.count(toi) > 0 || m_finished_tois.count(toi) > 0) | ||
| { | ||
| #if defined(BOOST_GEOMETRY_DEBUG_TRAVERSE_GRAPH) | ||
| std::cout << "ALREADY visited, turn " << toi | ||
| << " in {" << current_node_id | ||
| << " -> size " << next_target_nodes.size() << "}" << std::endl; | ||
| #endif | ||
| return false; | ||
| } | ||
|
|
||
| detail::overlay::append_no_collinear(ring, turn_point, m_strategy); | ||
|
|
||
| set_visited(toi); | ||
| use_vertices(ring, toi); | ||
|
|
||
| auto const& selected_op = m_turns[toi.turn_index].operations[toi.operation_index]; | ||
| auto const next_target_node_id = get_node_id(m_turns, | ||
| selected_op.enriched.travels_to_ip_index); | ||
| if (next_target_node_id == start_node_id) | ||
| { | ||
| #if defined(BOOST_GEOMETRY_DEBUG_TRAVERSE_GRAPH) | ||
| std::cout << "Finished at: " << next_target_node_id << std::endl; | ||
| #endif | ||
| return true; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. This was a recursive call, not wise in hindsight. |
||
| current_node_id = next_target_node_id; | ||
| ++iteration_count; | ||
| } | ||
| #if defined(BOOST_GEOMETRY_DEBUG_TRAVERSE_GRAPH) | ||
| std::cout << "Cancelled at: " << iteration_count << std::endl; | ||
| #endif | ||
| return false; | ||
| } | ||
|
|
||
| template <typename Rings> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code within this while-loop is all the same as before.
But we don't call itself recursively anymore (for large geometries on some operating systems, this could result in a stack overflow). It is just a while loop now which was a trivial change, and much better. If there are many turns (for example for equal geometries), it can loop for (for example) more than 3000 times which should not cause any problem.