Skip to content

area graph vertex search: ignore devel-only points#228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jteresco merged 1 commit into from
Jun 20, 2019
Merged

area graph vertex search: ignore devel-only points #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions siteupdate/cplusplus/classes/GraphGeneration/PlaceRadius.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,8 +84,10 @@ std::unordered_set<HGVertex*> PlaceRadius::v_search(WaypointQuadtree *qt, Highwa
// we search for vertices within this quadrant
if (!qt->refined())
{ for (Waypoint *p : qt->points)
if ((!p->colocated || p == p->colocated->front()) && contains_vertex(p->lat, p->lng))
vertex_set.insert(g->vertices.at(p));
if ( (!p->colocated || p == p->colocated->front())
&& p->is_or_colocated_with_active_or_preview()
&& contains_vertex(p->lat, p->lng)
) vertex_set.insert(g->vertices.at(p));
}
// if we're not a terminal quadrant, we need to determine which
// of our child quadrants we need to search and recurse into each
Expand Down
2 changes: 1 addition & 1 deletion siteupdate/python-teresco/siteupdate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1569,7 +1569,7 @@ def v_search(self, qt, g, w_bound, e_bound):
# we search for vertices within this quadrant
if qt.points is not None:
for p in qt.points:
if (p.colocated is None or p == p.colocated[0]) and self.contains_vertex(p):
if (p.colocated is None or p == p.colocated[0]) and p.is_or_colocated_with_active_or_preview() and self.contains_vertex(p):
vertex_set.add(g.vertices[p])
# if we're not a terminal quadrant, we need to determine which
# of our child quadrants we need to search and recurse into each
Expand Down