Fixed nonroot geotree, leafnode positions

This commit is contained in:
Rick Falkvinge
2017-01-22 14:09:15 +01:00
parent 2e8d4e710a
commit a6be5ad307
3 changed files with 19 additions and 13 deletions
+6 -5
View File
@@ -24,10 +24,11 @@ namespace Swarmops.Common.Generics
get { return this._nodeLookup[identity]; }
}
public static Tree<TNode> FromCollection (List<TNode> collection)
public static Tree<TNode> FromCollection (List<TNode> collection, IHasParentIdentity rootNode = null)
{
Dictionary<int, List<TreeNode<TNode>>> parentLookup = new Dictionary<int, List<TreeNode<TNode>>>();
Tree<TNode> result = new Tree<TNode>();
int rootParentNodeId = (rootNode == null ? 0 : rootNode.ParentIdentity);
// To construct a tree from a random collection, start by keying all parent identities into a dictionary
@@ -45,15 +46,15 @@ namespace Swarmops.Common.Generics
// Then, recurse into that dictionary, starting at parentId zero which becomes the root level
result.RootNodes = ConstructRecurse (null, parentLookup);
result.RootNodes = ConstructRecurse (null, parentLookup, rootParentNodeId);
return result;
}
private static List<TreeNode<TNode>> ConstructRecurse (TreeNode<TNode> parent, Dictionary<int, List<TreeNode<TNode>>> parentLookup)
private static List<TreeNode<TNode>> ConstructRecurse (TreeNode<TNode> parent, Dictionary<int, List<TreeNode<TNode>>> parentLookup, int rootParentNodeId = 0)
{
List<TreeNode<TNode>> result = new List<TreeNode<TNode>>();
int nodeId = parent == null ? 0 : parent.Data.Identity;
int nodeId = parent == null ? rootParentNodeId : parent.Data.Identity;
if (!parentLookup.ContainsKey (nodeId))
{
@@ -63,7 +64,7 @@ namespace Swarmops.Common.Generics
foreach (TreeNode<TNode> node in parentLookup[nodeId])
{
node.Parent = parent;
node.Children = ConstructRecurse (node, parentLookup);
node.Children = ConstructRecurse (node, parentLookup, rootParentNodeId);
result.Add (node);
}
+1 -1
View File
@@ -70,7 +70,7 @@ namespace Swarmops.Logic.Structure
get
{
Geographies geographies = this.ThisAndBelow();
return Tree<Geography>.FromCollection (geographies);
return Tree<Geography>.FromCollection (geographies, this);
}
}
+12 -7
View File
@@ -78,14 +78,19 @@ namespace Swarmops.Logic.Swarm
Tree<Position> treeResult = result.Tree;
Tree<Geography> geoTree = geography.Tree;
if (geography.ChildrenCount > 0) // Add subleaders if there are child geographies
{
Tree<Geography> geoTree = geography.Tree;
Position expandingSubleaderNode =
Position.FromBasic(new BasicPosition(0, PositionLevel.GeographyDefault, organization.Identity, geography.Identity, 0, 0, 0, DateTime.Today,
"Geographic_ExpandingSubleaderNode", "UxElement", false, true, false, false, false, 0, 0, 0, 0)); // UX element, not real position
TreeNode<Position> expandingNode = treeResult.RootNodes[0].AddChild(expandingSubleaderNode);
ForOrganizationGeographyRecurse (geoTree.RootNodes[0], expandingNode, geographyLeaderTemplate, 2);
Position expandingSubleaderNode =
Position.FromBasic(new BasicPosition(0, PositionLevel.GeographyDefault, organization.Identity,
geography.Identity, 0, 0, 0, DateTime.Today,
"Geographic_ExpandingSubleaderNode", "UxElement", false, true, false, false, false, 0, 0, 0, 0));
// UX element, not real position
TreeNode<Position> expandingNode = treeResult.RootNodes[0].AddChild(expandingSubleaderNode);
ForOrganizationGeographyRecurse(geoTree.RootNodes[0], expandingNode, geographyLeaderTemplate, 2);
}
return treeResult;
}