add references to feeder info; remove one that was not never set

Author: jesper-dax

src/CIM.Core/DAX.CIM.PhysicalNetworkModel.FeederInfo/ConductingEquipmentFeederInfo.cs

@@ -12,5 +12,6 @@ public class ConductingEquipmentFeederInfo
         public int TraversalOrder { get; set; }
         public int SubstationHop { get; set; }
         public Guid FirstCustomerCableId { get; set; }
+        public Guid ParentBusbarId { get; set; }
     }
 }

src/CIM.Core/DAX.CIM.PhysicalNetworkModel.FeederInfo/FeederInfoContext.cs

@@ -321,12 +321,26 @@ private void SubstationInternalPowerTransformerTrace()
                         false
                      ).ToList();
 
+                        BusbarSectionExt busbar = null;
+
                         foreach (var cimObj in traceResult)
                         {
+
+                            if (cimObj is ConnectivityNode)
+                            {
+                                var connections = _cimContext.GetConnections((ConnectivityNode)cimObj);
+                                
+                                var busbarFound = connections.FirstOrDefault(c => c.ConductingEquipment is BusbarSectionExt).ConductingEquipment as BusbarSectionExt;
+                                
+                                if (busbarFound != null)
+                                    busbar = busbarFound;
+                            }
+
                             if (cimObj is ConnectivityNode && _connectionPoints.ContainsKey((ConnectivityNode)cimObj))
                             {
                                 var cp = _connectionPoints[(ConnectivityNode)cimObj];
                                 cp.PowerTransformer = pt;
+                                cp.BusbarSection = busbar;
                             }
                         }
                     }
@@ -416,6 +430,7 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
 
                         bool customerCableFound = false;
                         Guid customerCableId = Guid.Empty;
+                        Guid parentBusbarId = Guid.Empty;
 
                         int traversalOrder = 0;
 
@@ -475,7 +490,9 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
 
                                     busbarProcessed.Add((BusbarSection)busbar);
 
-                                    AssignFeederToConductingEquipment(busbar, feeder, traversalOrder, stationHop, customerCableId);
+                                    AssignFeederToConductingEquipment(busbar, feeder, traversalOrder, stationHop, customerCableId, parentBusbarId);
+
+                                    parentBusbarId = Guid.Parse(busbar.mRID);
                                 }
                             }
 
@@ -487,10 +504,12 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
                                 if (ce is BusbarSection)
                                 {
                                     if (!busbarProcessed.Contains(ce))
-                                        AssignFeederToConductingEquipment(ce, feeder, traversalOrder, cimObj.stationHop, customerCableId);
+                                        AssignFeederToConductingEquipment(ce, feeder, traversalOrder, cimObj.stationHop, customerCableId, parentBusbarId);
+
+                                    parentBusbarId = Guid.Parse(ce.mRID);
                                 }
                                 else
-                                    AssignFeederToConductingEquipment(ce, feeder, traversalOrder, cimObj.stationHop, customerCableId);
+                                    AssignFeederToConductingEquipment(ce, feeder, traversalOrder, cimObj.stationHop, customerCableId, parentBusbarId);
 
                                 // If a busbar or powertransformer inside substation container add feeder to substation as well
                                 if ((ce is BusbarSection || ce is PowerTransformer) && ce.IsInsideSubstation(_cimContext))
@@ -513,6 +532,8 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
                 // power transformer feeders
                 if (cp.Kind == ConnectionPointKind.PowerTranformer)
                 {
+                    Guid parentBusbarId = Guid.Empty;
+
                     foreach (var feeder in cp.Feeders)
                     {
                         var pt = feeder.ConductingEquipment as PowerTransformer;
@@ -531,6 +552,17 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
                         {
                             int traversalOrder = 0;
 
+                            if (cimObj is ConnectivityNode)
+                            {
+                                var connections = _cimContext.GetConnections((ConnectivityNode)cimObj);
+                                var busbar = connections.FirstOrDefault(c => c.ConductingEquipment is BusbarSection).ConductingEquipment;
+
+                                if (busbar != null)
+                                {
+                                    parentBusbarId = Guid.Parse(busbar.mRID);
+                                }
+                            }
+
                             if (cimObj is ConductingEquipment)
                             {
                                 traversalOrder++;
@@ -539,19 +571,19 @@ ce is PowerTransformer // because power transformers sometimes has no base volta
 
                                 // We don't want to add feeder to power transformers and ac line segments outsit station.
                                 if (!(ce is PowerTransformer) && !(ce is ACLineSegment && !ce.IsInsideSubstation(_cimContext)))
-                                    AssignFeederToConductingEquipment(ce, feeder, traversalOrder, 0, Guid.Empty);
+                                    AssignFeederToConductingEquipment(ce, feeder, traversalOrder, 0, Guid.Empty, parentBusbarId);
                             }
                         }
                     }
                 } 
             }
         }
 
-        private void AssignFeederToConductingEquipment(ConductingEquipment ce, Feeder feeder, int traversalOrder, int substationHop, Guid customerCableId)
+        private void AssignFeederToConductingEquipment(ConductingEquipment ce, Feeder feeder, int traversalOrder, int substationHop, Guid customerCableId, Guid parentBusbarId)
         {
             if (!_conductingEquipmentFeeders.ContainsKey(ce))
             {
-                _conductingEquipmentFeeders[ce] = new ConductingEquipmentFeederInfo() { SubstationHop = substationHop, TraversalOrder=traversalOrder, FirstCustomerCableId = customerCableId };
+                _conductingEquipmentFeeders[ce] = new ConductingEquipmentFeederInfo() { SubstationHop = substationHop, TraversalOrder=traversalOrder, FirstCustomerCableId = customerCableId, ParentBusbarId = parentBusbarId };
                 _conductingEquipmentFeeders[ce].Feeders.Add(feeder);
             }
             else

src/CIM.Core/DAX.CIM.PhysicalNetworkModel.FeederInfo/FlatFeederInfo.cs

@@ -15,7 +15,6 @@ public class FlatFeederInfo : IdentifiedObject
         public bool Multifeed { get; set; }
         public Guid CustomerFeederCableMRID { get; set; }
         public Guid CableBoxMRID { get; set; }
-        public Guid CableBoxBusbarMRID { get; set; }
         public Guid SecondarySubstationMRID { get; set; }
         public Guid SecondarySubstationBayMRID { get; set; }
         public Guid SecondarySubstationTransformerMRID { get; set; }
@@ -27,7 +26,18 @@ public class FlatFeederInfo : IdentifiedObject
         public bool MultifeedAllowed { get; set; }
         public int NodeHopCount { get; set; }
         public int TraversalOrder { get; set; }
-  
+        public Guid CableBoxBayMRID { get; set; }
+        
+        /// <summary>
+        /// Upstream busbar in the feeding substation that the feeder get its power from. Might be null - i.e. if there's a connection directly to the power transformer.
+        /// </summary>
+        public Guid FeederBusbarMRID { get; set; }
+
+        /// <summary>
+        /// As soon a busbar is passed this attribut will be filled out. Until then it will be null. Can be used to create busbar-to-busbar topologies.
+        /// </summary>
+        public Guid ParentBusbarMRID { get; set; }
+
         public FlatFeederInfo()
         {
             mRID = Guid.NewGuid().ToString();

src/CIM.Core/DAX.CIM.PhysicalNetworkModel/FeederInfo/ConnectionPoint.cs

@@ -20,6 +20,7 @@ public class ConnectionPoint
         public ConnectivityNode ConnectivityNode { get; set; }
         public Substation Substation { get; set; }
         public PowerTransformer PowerTransformer { get; set; }
+        public BusbarSectionExt BusbarSection { get; set; }
         public Bay Bay { get; set; }
 
         public IReadOnlyList<Feeder> Feeders
@@ -33,6 +34,7 @@ public IReadOnlyList<Feeder> Feeders
             }
         }
 
+
         public void AddFeeder(Feeder feeder)
         {
             if (_feeders == null)