Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Filter segments correctly by bounding box

Browse Source
This commit is contained in:
Patrick Niklaus 2016-04-03 11:41:46 +02:00
parent c540c85cf8
commit 6e50b5fc60
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/util/static_rtree.hpp
View File

@ -351,6 +351,8 @@ class StaticRTree
{ {
const auto &current_edge = current_leaf_node.objects[i]; const auto &current_edge = current_leaf_node.objects[i];
// we don't need to project the coordinates here,
// because we use the unprojected rectangle to test against
const Rectangle bbox{std::min((*m_coordinate_list)[current_edge.u].lon, const Rectangle bbox{std::min((*m_coordinate_list)[current_edge.u].lon,
(*m_coordinate_list)[current_edge.v].lon), (*m_coordinate_list)[current_edge.v].lon),
std::max((*m_coordinate_list)[current_edge.u].lon, std::max((*m_coordinate_list)[current_edge.u].lon,
@ -360,6 +362,7 @@ class StaticRTree
std::max((*m_coordinate_list)[current_edge.u].lat, std::max((*m_coordinate_list)[current_edge.u].lat,
(*m_coordinate_list)[current_edge.v].lat)}; (*m_coordinate_list)[current_edge.v].lat)};
// use the _unprojected_ input rectangle here
if (bbox.Intersects(search_rectangle)) if (bbox.Intersects(search_rectangle))
{ {
results.push_back(current_edge); results.push_back(current_edge);
@ -376,7 +379,7 @@ class StaticRTree
const auto &child_tree_node = m_search_tree[child_id]; const auto &child_tree_node = m_search_tree[child_id];
const auto &child_rectangle = child_tree_node.minimum_bounding_rectangle; const auto &child_rectangle = child_tree_node.minimum_bounding_rectangle;
if (child_rectangle.Intersects(search_rectangle)) if (child_rectangle.Intersects(projected_rectangle))
{ {
traversal_queue.push(m_search_tree[child_id]); traversal_queue.push(m_search_tree[child_id]);
} }