Skip to content

FIX removing and entry could accidentally clear the whole tree #2

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

Open
hagish wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FIX removing and entry could accidentally clear the whole tree #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c3dc1d
fix typo
hagish Jul 18, 2015
b837481
fix removing could accidentally clear the whole tree.
hagish Jul 18, 2015
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
22 changes: 12 additions & 10 deletions src/RTree/RTree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private void Insert(RTreeNode<T> item, int level)
}

// adjust bboxes along the insertion path
AdjutsParentBounds(envelope, insertPath, level);
AdjustParentBounds(envelope, insertPath, level);
}

private static int CombinedArea(Envelope what, Envelope with)
Expand Down Expand Up @@ -416,24 +416,26 @@ public void Remove(T item, Envelope envelope)

private void CondenseNodes(IList<RTreeNode<T>> path)
{
var count = path.Count;

// go through the path, removing empty nodes and updating bboxes
for (var i = path.Count - 1; i >= 0; i--)
for (var i = 0; i < count; i++)
{
if (path[i].Children.Count == 0)
if (path[i].Children.Count == 0)
{
if (i == 0)
if (i == count - 1)
{
Clear();
Clear();
}
else
{
var siblings = path[i - 1].Children;
siblings.Remove(path[i]);
}
var siblings = path[i + 1].Children;
siblings.Remove(path[i]);
}
}
else
{
RefreshEnvelope(path[i]);
RefreshEnvelope(path[i]);
}
}
}
Expand All @@ -456,7 +458,7 @@ private static Envelope SumChildBounds(RTreeNode<T> node, int startIndex, int en
return retval;
}

private static void AdjutsParentBounds(Envelope bbox, List<RTreeNode<T>> path, int level)
private static void AdjustParentBounds(Envelope bbox, List<RTreeNode<T>> path, int level)
{
// adjust bboxes along the given tree path
for (var i = level; i >= 0; i--)
Expand Down