fix routing with clusters

Signed-off-by: Lev Nachmanson <[email protected]>

Author: levnach

GraphLayout/MSAGL/Routing/ShapeCreator.cs

@@ -34,11 +34,12 @@ public static IEnumerable<Shape> GetShapes(GeometryGraph graph)
         }
 
         private static void GetShapesOnDict(Dictionary<Node, Shape> nodesToShapes, Cluster c) {
-            if (c.IsCollapsed) return;
             nodesToShapes.TryGetValue(c, out Shape cShape);
             if (cShape == null) {
-              cShape=  nodesToShapes[c] = CreateShapeWithClusterBoundaryPort(c);
+              cShape = nodesToShapes[c] = CreateShapeWithClusterBoundaryPort(c);
             }
+            if (c.IsCollapsed) return;
+
             foreach (var n in c.Nodes) {
                 nodesToShapes.TryGetValue(n, out Shape nShape);
                 if (nShape == null) {

GraphLayout/MSAGL/Routing/SplineRouter.cs

@@ -34,11 +34,7 @@ public class SplineRouter : AlgorithmBase {
     Shape[] rootShapes;
     IEnumerable<EdgeGeometry> edgeGeometriesEnumeration {
       get {
-        if (this._edges != null) {
-          foreach (var item in this._edges.Select(e => e.EdgeGeometry)) {
-              yield return item;
-          }
-        }
+        return this._edges?.Select(e => e.EdgeGeometry) ?? Enumerable.Empty<EdgeGeometry>();
       }
     }
     double coneAngle;