diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/VoltageLevelGraph.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/VoltageLevelGraph.java index d8af532a7..7162b0690 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/VoltageLevelGraph.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/VoltageLevelGraph.java @@ -300,7 +300,7 @@ private void insertBusConnections(BusNode busNode, Predicate nodesOnBus) { } private void insertBusConnection(BusNode busNode, Node nodeConnectedToBusNode) { - Node fNodeToBus = NodeFactory.createBusConnection(this, nodeConnectedToBusNode.getId()); + Node fNodeToBus = NodeFactory.createBusConnection(this, busNode.getId() + "_" + nodeConnectedToBusNode.getId()); insertNode(busNode, fNodeToBus, nodeConnectedToBusNode); } @@ -329,7 +329,7 @@ private void insertHookNodesAtBuses(BusNode busNode) { private void insertBusHookNode(Node nodeOnBus, Node node) { // Create hook node - Node fStackNode = NodeFactory.createConnectivityNode(this, node.getId()); + Node fStackNode = NodeFactory.createConnectivityNode(this, nodeOnBus.getId() + "-" + node.getId()); // Update edges if (node.getType() == NodeType.FEEDER) { diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialBlock.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialBlock.java index 911d1cab3..40effaad3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialBlock.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialBlock.java @@ -74,8 +74,8 @@ public void test() { assertTrue(sb.getSubBlocks().get(2).isEmbeddingNodeType(FEEDER)); assertEquals("bbs", sb.getSubBlocks().get(0).getStartingNode().getId()); - assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(0).getEndingNode().getId()); - assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getStartingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(0).getEndingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getStartingNode().getId()); assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(1).getEndingNode().getId()); assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(2).getStartingNode().getId()); assertEquals("la", sb.getSubBlocks().get(2).getEndingNode().getId()); @@ -127,11 +127,11 @@ public void test() { sb.reverseBlock(); // LegPrimaryBlock is NOT reversed (bus is always the starting node) - assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getEndingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getEndingNode().getId()); assertEquals("bbs", sb.getSubBlocks().get(2).getStartingNode().getId()); // BodyPrimaryBlock is reversed - assertEquals("INTERNAL_vl_ba", sb.getSubBlocks().get(1).getEndingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", sb.getSubBlocks().get(1).getEndingNode().getId()); assertEquals("INTERNAL_vl_la", sb.getSubBlocks().get(1).getStartingNode().getId()); // FeederPrimaryBlock is NOT reversed (feeder is always the ending node) diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialParallelBlock.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialParallelBlock.java index 7ef864d3f..843599652 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialParallelBlock.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSerialParallelBlock.java @@ -136,8 +136,8 @@ public void test() { sb.reverseBlock(); - assertEquals("INTERNAL_vl_ba", sb.getEndingNode().getId()); - assertEquals("INTERNAL_vl_ba", subSB.getEndingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", sb.getEndingNode().getId()); + assertEquals("INTERNAL_vl_da-ba", subSB.getEndingNode().getId()); assertEquals("INTERNAL_vl_2", subPB.getSubBlocks().get(1).getEndingNode().getId()); } } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg index 3c416720f..a810845c8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg @@ -84,40 +84,40 @@ B12 - + - + - + - + - + - + - + - + - + - + @@ -133,10 +133,10 @@ — - + - + @@ -150,10 +150,10 @@ - + - + @@ -169,10 +169,10 @@ — - + - + @@ -183,10 +183,10 @@ - + - + @@ -202,10 +202,10 @@ — - + - + @@ -216,10 +216,10 @@ - + - + @@ -235,10 +235,10 @@ — - + - + @@ -249,10 +249,10 @@ - + - + @@ -281,10 +281,10 @@ — - + - + @@ -300,10 +300,10 @@ - + - + @@ -319,10 +319,10 @@ — - + - + @@ -336,10 +336,10 @@ - + - + @@ -355,10 +355,10 @@ — - + - + @@ -369,10 +369,10 @@ - + - + @@ -388,10 +388,10 @@ — - + - + @@ -402,10 +402,10 @@ - + - + @@ -421,10 +421,10 @@ — - + - + @@ -437,10 +437,10 @@ - + - + @@ -469,10 +469,10 @@ — - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerH.json b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerH.json index df20bf0f9..a706803be 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerH.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerH.json @@ -58,88 +58,88 @@ "kind" : "BREAKER" }, { "type" : "INTERNAL", - "id" : "BUSCO_BR1", + "id" : "BUSCO_B11_BR1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_BR1", + "id" : "BUSCO_B11_L11_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 25.0, - "y" : 197.0 - }, { - "type" : "INTERNAL", - "id" : "BUSCO_G", - "componentType" : "BUS_CONNECTION", - "fictitious" : true, - "x" : 375.0, - "y" : 197.0, + "x" : 175.0, + "y" : 172.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_L11_ONE", + "id" : "BUSCO_B11_L12_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 175.0, + "x" : 275.0, "y" : 172.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_L11_TWO", + "id" : "BUSCO_B11_LD1", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 425.0, - "y" : 197.0 + "x" : 125.0, + "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_L12_ONE", + "id" : "BUSCO_B11_T11_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 275.0, - "y" : 172.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_LD1", + "id" : "BUSCO_B11_T3_12_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 125.0, + "x" : 325.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T11_ONE", + "id" : "BUSCO_B12_BR1", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 225.0, - "y" : 172.0 + "x" : 25.0, + "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T11_TWO", + "id" : "BUSCO_B12_G", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 475.0, + "x" : 375.0, "y" : 197.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_T12_ONE", + "id" : "BUSCO_B12_L11_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 525.0, + "x" : 425.0, "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_ONE", + "id" : "BUSCO_B12_T11_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 325.0, - "y" : 172.0 + "x" : 475.0, + "y" : 197.0, + "orientation" : "DOWN" + }, { + "type" : "INTERNAL", + "id" : "BUSCO_B12_T12_ONE", + "componentType" : "BUS_CONNECTION", + "fictitious" : true, + "x" : 525.0, + "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_TWO", + "id" : "BUSCO_B12_T3_12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 575.0, @@ -160,116 +160,138 @@ "direction" : "BOTTOM" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 132.0 + "x" : 175.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_G", + "id" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 375.0, + "x" : 275.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_G", + "id" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "componentType" : "NODE", "fictitious" : true, - "x" : 375.0, - "y" : 307.0, - "orientation" : "DOWN" + "x" : 125.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_ONE", + "id" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_ONE", + "id" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 307.0, + "x" : 325.0, + "y" : 142.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_G-G", + "componentType" : "NODE", + "fictitious" : true, + "x" : 375.0, + "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_TWO", + "id" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_TWO", + "id" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 425.0, - "y" : 62.0 + "x" : 475.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L12_ONE", + "id" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 525.0, + "y" : 142.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", + "componentType" : "NODE", + "fictitious" : true, + "x" : 575.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L12_ONE", + "id" : "INTERNAL_VL1_G", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 375.0, "y" : 307.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_LD1", + "id" : "INTERNAL_VL1_L11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 142.0 + "x" : 175.0, + "y" : 307.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_LD1", + "id" : "INTERNAL_VL1_L11_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, + "x" : 425.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_ONE", + "id" : "INTERNAL_VL1_L12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, - "y" : 142.0 + "x" : 275.0, + "y" : 307.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_ONE", + "id" : "INTERNAL_VL1_LD1", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 125.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_TWO", + "id" : "INTERNAL_VL1_T11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 475.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 62.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T11_TWO", @@ -278,13 +300,6 @@ "x" : 475.0, "y" : 307.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T12_ONE", - "componentType" : "NODE", - "fictitious" : true, - "x" : 525.0, - "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T12_ONE", @@ -292,13 +307,6 @@ "fictitious" : true, "x" : 525.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T3_12_ONE", - "componentType" : "NODE", - "fictitious" : true, - "x" : 325.0, - "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T3_12_ONE", @@ -306,14 +314,6 @@ "fictitious" : true, "x" : 325.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T3_12_TWO", - "componentType" : "NODE", - "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T3_12_TWO", @@ -526,7 +526,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "B12", "BUSCO_B12_BR1", "INTERNAL_VL1_BUSCO_B12_BR1-BR1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -547,7 +547,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_VL1_BR1", "BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_BR1-BR1", "BR1", "INTERNAL_VL1_BUSCO_B11_BR1-BR1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -568,7 +568,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "B11", "BUSCO_B11_BR1", "INTERNAL_VL1_BUSCO_B11_BR1-BR1" ] } ] } }, { @@ -616,7 +616,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_LD1", "INTERNAL_VL1_LD1" ] + "nodes" : [ "B11", "BUSCO_B11_LD1", "INTERNAL_VL1_BUSCO_B11_LD1-LD1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -637,7 +637,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_LD1", "INTERNAL_VL1_LD1" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "INTERNAL_VL1_LD1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -706,7 +706,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_L11_ONE", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_L11_ONE", "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -727,7 +727,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L11_ONE", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "INTERNAL_VL1_L11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -796,7 +796,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_T11_ONE", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_T11_ONE", "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -817,7 +817,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T11_ONE", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "INTERNAL_VL1_T11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -886,7 +886,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_L12_ONE", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_L12_ONE", "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -907,7 +907,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L12_ONE", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "INTERNAL_VL1_L12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -976,7 +976,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_T3_12_ONE", "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -997,7 +997,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1066,7 +1066,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_G", "INTERNAL_VL1_G" ] + "nodes" : [ "B12", "BUSCO_B12_G", "INTERNAL_VL1_BUSCO_B12_G-G" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1087,7 +1087,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_G", "INTERNAL_VL1_G" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_G-G", "INTERNAL_VL1_G" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1156,7 +1156,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_L11_TWO", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_L11_TWO", "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1177,7 +1177,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L11_TWO", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "INTERNAL_VL1_L11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1246,7 +1246,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T11_TWO", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_T11_TWO", "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1267,7 +1267,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T11_TWO", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "INTERNAL_VL1_T11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1336,7 +1336,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T12_ONE", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "B12", "BUSCO_B12_T12_ONE", "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1357,7 +1357,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T12_ONE", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "INTERNAL_VL1_T12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1426,7 +1426,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_T3_12_TWO", "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1447,7 +1447,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1474,138 +1474,138 @@ } ], "edges" : [ { "node1" : "B11", - "node2" : "BUSCO_LD1" + "node2" : "BUSCO_B11_LD1" }, { "node1" : "B11", - "node2" : "BUSCO_L11_ONE" + "node2" : "BUSCO_B11_L11_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_T11_ONE" + "node2" : "BUSCO_B11_T11_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_L12_ONE" + "node2" : "BUSCO_B11_L12_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_T3_12_ONE" + "node2" : "BUSCO_B11_T3_12_ONE" }, { - "node1" : "BUSCO_BR1", + "node1" : "BUSCO_B11_BR1", "node2" : "B11" }, { "node1" : "B12", - "node2" : "BUSCO_G" + "node2" : "BUSCO_B12_G" }, { "node1" : "B12", - "node2" : "BUSCO_L11_TWO" + "node2" : "BUSCO_B12_L11_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_T11_TWO" + "node2" : "BUSCO_B12_T11_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_T12_ONE" + "node2" : "BUSCO_B12_T12_ONE" }, { "node1" : "B12", - "node2" : "BUSCO_T3_12_TWO" + "node2" : "BUSCO_B12_T3_12_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_BR1" + "node2" : "BUSCO_B12_BR1" }, { - "node1" : "BUSCO_LD1", - "node2" : "INTERNAL_VL1_LD1" + "node1" : "BUSCO_B11_LD1", + "node2" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1" }, { - "node1" : "BUSCO_L11_ONE", - "node2" : "INTERNAL_VL1_L11_ONE" + "node1" : "BUSCO_B11_L11_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE" }, { - "node1" : "BUSCO_T11_ONE", - "node2" : "INTERNAL_VL1_T11_ONE" + "node1" : "BUSCO_B11_T11_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE" }, { - "node1" : "BUSCO_L12_ONE", - "node2" : "INTERNAL_VL1_L12_ONE" + "node1" : "BUSCO_B11_L12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE" }, { - "node1" : "BUSCO_T3_12_ONE", - "node2" : "INTERNAL_VL1_T3_12_ONE" + "node1" : "BUSCO_B11_T3_12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE" }, { "node1" : "BR1", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", - "node2" : "BUSCO_BR1" + "node1" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1", + "node2" : "BUSCO_B11_BR1" }, { - "node1" : "BUSCO_G", - "node2" : "INTERNAL_VL1_G" + "node1" : "BUSCO_B12_G", + "node2" : "INTERNAL_VL1_BUSCO_B12_G-G" }, { - "node1" : "BUSCO_L11_TWO", - "node2" : "INTERNAL_VL1_L11_TWO" + "node1" : "BUSCO_B12_L11_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO" }, { - "node1" : "BUSCO_T11_TWO", - "node2" : "INTERNAL_VL1_T11_TWO" + "node1" : "BUSCO_B12_T11_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO" }, { - "node1" : "BUSCO_T12_ONE", - "node2" : "INTERNAL_VL1_T12_ONE" + "node1" : "BUSCO_B12_T12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE" }, { - "node1" : "BUSCO_T3_12_TWO", - "node2" : "INTERNAL_VL1_T3_12_TWO" + "node1" : "BUSCO_B12_T3_12_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO" }, { - "node1" : "BUSCO_BR1", - "node2" : "INTERNAL_VL1_BR1" + "node1" : "BUSCO_B12_BR1", + "node2" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1", "node2" : "BR1" }, { - "node1" : "INTERNAL_VL1_LD1", + "node1" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "node2" : "INTERNAL_VL1_LD1" }, { "node1" : "INTERNAL_VL1_LD1", "node2" : "LD1" }, { - "node1" : "INTERNAL_VL1_L11_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "node2" : "INTERNAL_VL1_L11_ONE" }, { "node1" : "INTERNAL_VL1_L11_ONE", "node2" : "L11_ONE" }, { - "node1" : "INTERNAL_VL1_T11_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "node2" : "INTERNAL_VL1_T11_ONE" }, { "node1" : "INTERNAL_VL1_T11_ONE", "node2" : "T11_ONE" }, { - "node1" : "INTERNAL_VL1_L12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "node2" : "INTERNAL_VL1_L12_ONE" }, { "node1" : "INTERNAL_VL1_L12_ONE", "node2" : "L12_ONE" }, { - "node1" : "INTERNAL_VL1_T3_12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "node2" : "INTERNAL_VL1_T3_12_ONE" }, { "node1" : "INTERNAL_VL1_T3_12_ONE", "node2" : "T3_12_ONE" }, { - "node1" : "INTERNAL_VL1_G", + "node1" : "INTERNAL_VL1_BUSCO_B12_G-G", "node2" : "INTERNAL_VL1_G" }, { "node1" : "INTERNAL_VL1_G", "node2" : "G" }, { - "node1" : "INTERNAL_VL1_L11_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "node2" : "INTERNAL_VL1_L11_TWO" }, { "node1" : "INTERNAL_VL1_L11_TWO", "node2" : "L11_TWO" }, { - "node1" : "INTERNAL_VL1_T11_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "node2" : "INTERNAL_VL1_T11_TWO" }, { "node1" : "INTERNAL_VL1_T11_TWO", "node2" : "T11_TWO" }, { - "node1" : "INTERNAL_VL1_T12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "node2" : "INTERNAL_VL1_T12_ONE" }, { "node1" : "INTERNAL_VL1_T12_ONE", "node2" : "T12_ONE" }, { - "node1" : "INTERNAL_VL1_T3_12_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", "node2" : "INTERNAL_VL1_T3_12_TWO" }, { "node1" : "INTERNAL_VL1_T3_12_TWO", @@ -1683,7 +1683,7 @@ } }, { "type" : "INTERNAL", - "id" : "BUSCO_L12_TWO", + "id" : "BUSCO_B21_L12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, @@ -1691,21 +1691,21 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_LD2", + "id" : "BUSCO_B21_LD2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 25.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T12_TWO", + "id" : "BUSCO_B21_T12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 125.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_THREE", + "id" : "BUSCO_B21_T3_12_THREE", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 175.0, @@ -1713,7 +1713,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_L12_TWO", + "id" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -1721,48 +1721,48 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_L12_TWO", + "id" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 282.0, - "orientation" : "DOWN" + "x" : 25.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_LD2", + "id" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, + "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_LD2", + "id" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 62.0 + "x" : 175.0, + "y" : 202.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T12_TWO", + "id" : "INTERNAL_VL2_L12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 142.0 + "x" : 75.0, + "y" : 282.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T12_TWO", + "id" : "INTERNAL_VL2_LD2", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, + "x" : 25.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T3_12_THREE", + "id" : "INTERNAL_VL2_T12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 202.0, - "orientation" : "DOWN" + "x" : 125.0, + "y" : 62.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL2_T3_12_THREE", @@ -1885,7 +1885,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_LD2", "INTERNAL_VL2_LD2" ] + "nodes" : [ "B21", "BUSCO_B21_LD2", "INTERNAL_VL2_BUSCO_B21_LD2-LD2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1906,7 +1906,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_LD2", "INTERNAL_VL2_LD2" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "INTERNAL_VL2_LD2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1975,7 +1975,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_L12_TWO", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "B21", "BUSCO_B21_L12_TWO", "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1996,7 +1996,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_L12_TWO", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "INTERNAL_VL2_L12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2065,7 +2065,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_T12_TWO", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "B21", "BUSCO_B21_T12_TWO", "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2086,7 +2086,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_T12_TWO", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "INTERNAL_VL2_T12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2155,7 +2155,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "B21", "BUSCO_B21_T3_12_THREE", "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2176,7 +2176,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2203,48 +2203,48 @@ } ], "edges" : [ { "node1" : "B21", - "node2" : "BUSCO_LD2" + "node2" : "BUSCO_B21_LD2" }, { "node1" : "B21", - "node2" : "BUSCO_L12_TWO" + "node2" : "BUSCO_B21_L12_TWO" }, { "node1" : "B21", - "node2" : "BUSCO_T12_TWO" + "node2" : "BUSCO_B21_T12_TWO" }, { "node1" : "B21", - "node2" : "BUSCO_T3_12_THREE" + "node2" : "BUSCO_B21_T3_12_THREE" }, { - "node1" : "BUSCO_LD2", - "node2" : "INTERNAL_VL2_LD2" + "node1" : "BUSCO_B21_LD2", + "node2" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2" }, { - "node1" : "BUSCO_L12_TWO", - "node2" : "INTERNAL_VL2_L12_TWO" + "node1" : "BUSCO_B21_L12_TWO", + "node2" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO" }, { - "node1" : "BUSCO_T12_TWO", - "node2" : "INTERNAL_VL2_T12_TWO" + "node1" : "BUSCO_B21_T12_TWO", + "node2" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO" }, { - "node1" : "BUSCO_T3_12_THREE", - "node2" : "INTERNAL_VL2_T3_12_THREE" + "node1" : "BUSCO_B21_T3_12_THREE", + "node2" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE" }, { - "node1" : "INTERNAL_VL2_LD2", + "node1" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "node2" : "INTERNAL_VL2_LD2" }, { "node1" : "INTERNAL_VL2_LD2", "node2" : "LD2" }, { - "node1" : "INTERNAL_VL2_L12_TWO", + "node1" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "node2" : "INTERNAL_VL2_L12_TWO" }, { "node1" : "INTERNAL_VL2_L12_TWO", "node2" : "L12_TWO" }, { - "node1" : "INTERNAL_VL2_T12_TWO", + "node1" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "node2" : "INTERNAL_VL2_T12_TWO" }, { "node1" : "INTERNAL_VL2_T12_TWO", "node2" : "T12_TWO" }, { - "node1" : "INTERNAL_VL2_T3_12_THREE", + "node1" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "node2" : "INTERNAL_VL2_T3_12_THREE" }, { "node1" : "INTERNAL_VL2_T3_12_THREE", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerV.json b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerV.json index 58ce098fa..2107558e7 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerV.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreakerV.json @@ -58,88 +58,88 @@ "kind" : "BREAKER" }, { "type" : "INTERNAL", - "id" : "BUSCO_BR1", + "id" : "BUSCO_B11_BR1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_BR1", + "id" : "BUSCO_B11_L11_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 25.0, - "y" : 197.0 - }, { - "type" : "INTERNAL", - "id" : "BUSCO_G", - "componentType" : "BUS_CONNECTION", - "fictitious" : true, - "x" : 375.0, - "y" : 197.0, + "x" : 175.0, + "y" : 172.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_L11_ONE", + "id" : "BUSCO_B11_L12_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 175.0, + "x" : 275.0, "y" : 172.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_L11_TWO", + "id" : "BUSCO_B11_LD1", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 425.0, - "y" : 197.0 + "x" : 125.0, + "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_L12_ONE", + "id" : "BUSCO_B11_T11_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 275.0, - "y" : 172.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_LD1", + "id" : "BUSCO_B11_T3_12_ONE", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 125.0, + "x" : 325.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T11_ONE", + "id" : "BUSCO_B12_BR1", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 225.0, - "y" : 172.0 + "x" : 25.0, + "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T11_TWO", + "id" : "BUSCO_B12_G", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 475.0, + "x" : 375.0, "y" : 197.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_T12_ONE", + "id" : "BUSCO_B12_L11_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 525.0, + "x" : 425.0, "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_ONE", + "id" : "BUSCO_B12_T11_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, - "x" : 325.0, - "y" : 172.0 + "x" : 475.0, + "y" : 197.0, + "orientation" : "DOWN" + }, { + "type" : "INTERNAL", + "id" : "BUSCO_B12_T12_ONE", + "componentType" : "BUS_CONNECTION", + "fictitious" : true, + "x" : 525.0, + "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_TWO", + "id" : "BUSCO_B12_T3_12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 575.0, @@ -160,116 +160,138 @@ "direction" : "BOTTOM" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 132.0 + "x" : 175.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_G", + "id" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 375.0, + "x" : 275.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_G", + "id" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "componentType" : "NODE", "fictitious" : true, - "x" : 375.0, - "y" : 307.0, - "orientation" : "DOWN" + "x" : 125.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_ONE", + "id" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_ONE", + "id" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 307.0, + "x" : 325.0, + "y" : 142.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_G-G", + "componentType" : "NODE", + "fictitious" : true, + "x" : 375.0, + "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_TWO", + "id" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L11_TWO", + "id" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 425.0, - "y" : 62.0 + "x" : 475.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L12_ONE", + "id" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 525.0, + "y" : 142.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", + "componentType" : "NODE", + "fictitious" : true, + "x" : 575.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_L12_ONE", + "id" : "INTERNAL_VL1_G", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 375.0, "y" : 307.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_LD1", + "id" : "INTERNAL_VL1_L11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 142.0 + "x" : 175.0, + "y" : 307.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_LD1", + "id" : "INTERNAL_VL1_L11_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, + "x" : 425.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_ONE", + "id" : "INTERNAL_VL1_L12_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, - "y" : 142.0 + "x" : 275.0, + "y" : 307.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_ONE", + "id" : "INTERNAL_VL1_LD1", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 125.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T11_TWO", + "id" : "INTERNAL_VL1_T11_ONE", "componentType" : "NODE", "fictitious" : true, - "x" : 475.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 62.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T11_TWO", @@ -278,13 +300,6 @@ "x" : 475.0, "y" : 307.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T12_ONE", - "componentType" : "NODE", - "fictitious" : true, - "x" : 525.0, - "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T12_ONE", @@ -292,13 +307,6 @@ "fictitious" : true, "x" : 525.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T3_12_ONE", - "componentType" : "NODE", - "fictitious" : true, - "x" : 325.0, - "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T3_12_ONE", @@ -306,14 +314,6 @@ "fictitious" : true, "x" : 325.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_T3_12_TWO", - "componentType" : "NODE", - "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" }, { "type" : "INTERNAL", "id" : "INTERNAL_VL1_T3_12_TWO", @@ -526,7 +526,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "B12", "BUSCO_B12_BR1", "INTERNAL_VL1_BUSCO_B12_BR1-BR1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -547,7 +547,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_VL1_BR1", "BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_BR1-BR1", "BR1", "INTERNAL_VL1_BUSCO_B11_BR1-BR1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -568,7 +568,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "B11", "BUSCO_B11_BR1", "INTERNAL_VL1_BUSCO_B11_BR1-BR1" ] } ] } }, { @@ -616,7 +616,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_LD1", "INTERNAL_VL1_LD1" ] + "nodes" : [ "B11", "BUSCO_B11_LD1", "INTERNAL_VL1_BUSCO_B11_LD1-LD1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -637,7 +637,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_LD1", "INTERNAL_VL1_LD1" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "INTERNAL_VL1_LD1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -706,7 +706,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_L11_ONE", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_L11_ONE", "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -727,7 +727,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L11_ONE", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "INTERNAL_VL1_L11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -796,7 +796,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_T11_ONE", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_T11_ONE", "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -817,7 +817,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T11_ONE", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "INTERNAL_VL1_T11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -886,7 +886,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_L12_ONE", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_L12_ONE", "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -907,7 +907,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L12_ONE", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "INTERNAL_VL1_L12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -976,7 +976,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B11", "BUSCO_T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "B11", "BUSCO_B11_T3_12_ONE", "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -997,7 +997,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "INTERNAL_VL1_T3_12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1066,7 +1066,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_G", "INTERNAL_VL1_G" ] + "nodes" : [ "B12", "BUSCO_B12_G", "INTERNAL_VL1_BUSCO_B12_G-G" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1087,7 +1087,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_G", "INTERNAL_VL1_G" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_G-G", "INTERNAL_VL1_G" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1156,7 +1156,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_L11_TWO", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_L11_TWO", "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1177,7 +1177,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_L11_TWO", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "INTERNAL_VL1_L11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1246,7 +1246,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T11_TWO", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_T11_TWO", "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1267,7 +1267,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T11_TWO", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "INTERNAL_VL1_T11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1336,7 +1336,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T12_ONE", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "B12", "BUSCO_B12_T12_ONE", "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1357,7 +1357,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T12_ONE", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "INTERNAL_VL1_T12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1426,7 +1426,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B12", "BUSCO_T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "B12", "BUSCO_B12_T3_12_TWO", "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1447,7 +1447,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", "INTERNAL_VL1_T3_12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1474,138 +1474,138 @@ } ], "edges" : [ { "node1" : "B11", - "node2" : "BUSCO_LD1" + "node2" : "BUSCO_B11_LD1" }, { "node1" : "B11", - "node2" : "BUSCO_L11_ONE" + "node2" : "BUSCO_B11_L11_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_T11_ONE" + "node2" : "BUSCO_B11_T11_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_L12_ONE" + "node2" : "BUSCO_B11_L12_ONE" }, { "node1" : "B11", - "node2" : "BUSCO_T3_12_ONE" + "node2" : "BUSCO_B11_T3_12_ONE" }, { - "node1" : "BUSCO_BR1", + "node1" : "BUSCO_B11_BR1", "node2" : "B11" }, { "node1" : "B12", - "node2" : "BUSCO_G" + "node2" : "BUSCO_B12_G" }, { "node1" : "B12", - "node2" : "BUSCO_L11_TWO" + "node2" : "BUSCO_B12_L11_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_T11_TWO" + "node2" : "BUSCO_B12_T11_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_T12_ONE" + "node2" : "BUSCO_B12_T12_ONE" }, { "node1" : "B12", - "node2" : "BUSCO_T3_12_TWO" + "node2" : "BUSCO_B12_T3_12_TWO" }, { "node1" : "B12", - "node2" : "BUSCO_BR1" + "node2" : "BUSCO_B12_BR1" }, { - "node1" : "BUSCO_LD1", - "node2" : "INTERNAL_VL1_LD1" + "node1" : "BUSCO_B11_LD1", + "node2" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1" }, { - "node1" : "BUSCO_L11_ONE", - "node2" : "INTERNAL_VL1_L11_ONE" + "node1" : "BUSCO_B11_L11_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE" }, { - "node1" : "BUSCO_T11_ONE", - "node2" : "INTERNAL_VL1_T11_ONE" + "node1" : "BUSCO_B11_T11_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE" }, { - "node1" : "BUSCO_L12_ONE", - "node2" : "INTERNAL_VL1_L12_ONE" + "node1" : "BUSCO_B11_L12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE" }, { - "node1" : "BUSCO_T3_12_ONE", - "node2" : "INTERNAL_VL1_T3_12_ONE" + "node1" : "BUSCO_B11_T3_12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE" }, { "node1" : "BR1", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", - "node2" : "BUSCO_BR1" + "node1" : "INTERNAL_VL1_BUSCO_B11_BR1-BR1", + "node2" : "BUSCO_B11_BR1" }, { - "node1" : "BUSCO_G", - "node2" : "INTERNAL_VL1_G" + "node1" : "BUSCO_B12_G", + "node2" : "INTERNAL_VL1_BUSCO_B12_G-G" }, { - "node1" : "BUSCO_L11_TWO", - "node2" : "INTERNAL_VL1_L11_TWO" + "node1" : "BUSCO_B12_L11_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO" }, { - "node1" : "BUSCO_T11_TWO", - "node2" : "INTERNAL_VL1_T11_TWO" + "node1" : "BUSCO_B12_T11_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO" }, { - "node1" : "BUSCO_T12_ONE", - "node2" : "INTERNAL_VL1_T12_ONE" + "node1" : "BUSCO_B12_T12_ONE", + "node2" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE" }, { - "node1" : "BUSCO_T3_12_TWO", - "node2" : "INTERNAL_VL1_T3_12_TWO" + "node1" : "BUSCO_B12_T3_12_TWO", + "node2" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO" }, { - "node1" : "BUSCO_BR1", - "node2" : "INTERNAL_VL1_BR1" + "node1" : "BUSCO_B12_BR1", + "node2" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_BUSCO_B12_BR1-BR1", "node2" : "BR1" }, { - "node1" : "INTERNAL_VL1_LD1", + "node1" : "INTERNAL_VL1_BUSCO_B11_LD1-LD1", "node2" : "INTERNAL_VL1_LD1" }, { "node1" : "INTERNAL_VL1_LD1", "node2" : "LD1" }, { - "node1" : "INTERNAL_VL1_L11_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_L11_ONE-L11_ONE", "node2" : "INTERNAL_VL1_L11_ONE" }, { "node1" : "INTERNAL_VL1_L11_ONE", "node2" : "L11_ONE" }, { - "node1" : "INTERNAL_VL1_T11_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_T11_ONE-T11_ONE", "node2" : "INTERNAL_VL1_T11_ONE" }, { "node1" : "INTERNAL_VL1_T11_ONE", "node2" : "T11_ONE" }, { - "node1" : "INTERNAL_VL1_L12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_L12_ONE-L12_ONE", "node2" : "INTERNAL_VL1_L12_ONE" }, { "node1" : "INTERNAL_VL1_L12_ONE", "node2" : "L12_ONE" }, { - "node1" : "INTERNAL_VL1_T3_12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B11_T3_12_ONE-T3_12_ONE", "node2" : "INTERNAL_VL1_T3_12_ONE" }, { "node1" : "INTERNAL_VL1_T3_12_ONE", "node2" : "T3_12_ONE" }, { - "node1" : "INTERNAL_VL1_G", + "node1" : "INTERNAL_VL1_BUSCO_B12_G-G", "node2" : "INTERNAL_VL1_G" }, { "node1" : "INTERNAL_VL1_G", "node2" : "G" }, { - "node1" : "INTERNAL_VL1_L11_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_L11_TWO-L11_TWO", "node2" : "INTERNAL_VL1_L11_TWO" }, { "node1" : "INTERNAL_VL1_L11_TWO", "node2" : "L11_TWO" }, { - "node1" : "INTERNAL_VL1_T11_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_T11_TWO-T11_TWO", "node2" : "INTERNAL_VL1_T11_TWO" }, { "node1" : "INTERNAL_VL1_T11_TWO", "node2" : "T11_TWO" }, { - "node1" : "INTERNAL_VL1_T12_ONE", + "node1" : "INTERNAL_VL1_BUSCO_B12_T12_ONE-T12_ONE", "node2" : "INTERNAL_VL1_T12_ONE" }, { "node1" : "INTERNAL_VL1_T12_ONE", "node2" : "T12_ONE" }, { - "node1" : "INTERNAL_VL1_T3_12_TWO", + "node1" : "INTERNAL_VL1_BUSCO_B12_T3_12_TWO-T3_12_TWO", "node2" : "INTERNAL_VL1_T3_12_TWO" }, { "node1" : "INTERNAL_VL1_T3_12_TWO", @@ -1683,7 +1683,7 @@ } }, { "type" : "INTERNAL", - "id" : "BUSCO_L12_TWO", + "id" : "BUSCO_B21_L12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, @@ -1691,21 +1691,21 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "BUSCO_LD2", + "id" : "BUSCO_B21_LD2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 25.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T12_TWO", + "id" : "BUSCO_B21_T12_TWO", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 125.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_T3_12_THREE", + "id" : "BUSCO_B21_T3_12_THREE", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 175.0, @@ -1713,7 +1713,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_L12_TWO", + "id" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -1721,48 +1721,48 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_L12_TWO", + "id" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 282.0, - "orientation" : "DOWN" + "x" : 25.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_LD2", + "id" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, + "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_LD2", + "id" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 62.0 + "x" : 175.0, + "y" : 202.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T12_TWO", + "id" : "INTERNAL_VL2_L12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 142.0 + "x" : 75.0, + "y" : 282.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T12_TWO", + "id" : "INTERNAL_VL2_LD2", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, + "x" : 25.0, "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_T3_12_THREE", + "id" : "INTERNAL_VL2_T12_TWO", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 202.0, - "orientation" : "DOWN" + "x" : 125.0, + "y" : 62.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_VL2_T3_12_THREE", @@ -1885,7 +1885,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_LD2", "INTERNAL_VL2_LD2" ] + "nodes" : [ "B21", "BUSCO_B21_LD2", "INTERNAL_VL2_BUSCO_B21_LD2-LD2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1906,7 +1906,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_LD2", "INTERNAL_VL2_LD2" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "INTERNAL_VL2_LD2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1975,7 +1975,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_L12_TWO", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "B21", "BUSCO_B21_L12_TWO", "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1996,7 +1996,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_L12_TWO", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "INTERNAL_VL2_L12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2065,7 +2065,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_T12_TWO", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "B21", "BUSCO_B21_T12_TWO", "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2086,7 +2086,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_T12_TWO", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "INTERNAL_VL2_T12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2155,7 +2155,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "B21", "BUSCO_T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "B21", "BUSCO_B21_T3_12_THREE", "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2176,7 +2176,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "INTERNAL_VL2_T3_12_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2203,48 +2203,48 @@ } ], "edges" : [ { "node1" : "B21", - "node2" : "BUSCO_LD2" + "node2" : "BUSCO_B21_LD2" }, { "node1" : "B21", - "node2" : "BUSCO_L12_TWO" + "node2" : "BUSCO_B21_L12_TWO" }, { "node1" : "B21", - "node2" : "BUSCO_T12_TWO" + "node2" : "BUSCO_B21_T12_TWO" }, { "node1" : "B21", - "node2" : "BUSCO_T3_12_THREE" + "node2" : "BUSCO_B21_T3_12_THREE" }, { - "node1" : "BUSCO_LD2", - "node2" : "INTERNAL_VL2_LD2" + "node1" : "BUSCO_B21_LD2", + "node2" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2" }, { - "node1" : "BUSCO_L12_TWO", - "node2" : "INTERNAL_VL2_L12_TWO" + "node1" : "BUSCO_B21_L12_TWO", + "node2" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO" }, { - "node1" : "BUSCO_T12_TWO", - "node2" : "INTERNAL_VL2_T12_TWO" + "node1" : "BUSCO_B21_T12_TWO", + "node2" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO" }, { - "node1" : "BUSCO_T3_12_THREE", - "node2" : "INTERNAL_VL2_T3_12_THREE" + "node1" : "BUSCO_B21_T3_12_THREE", + "node2" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE" }, { - "node1" : "INTERNAL_VL2_LD2", + "node1" : "INTERNAL_VL2_BUSCO_B21_LD2-LD2", "node2" : "INTERNAL_VL2_LD2" }, { "node1" : "INTERNAL_VL2_LD2", "node2" : "LD2" }, { - "node1" : "INTERNAL_VL2_L12_TWO", + "node1" : "INTERNAL_VL2_BUSCO_B21_L12_TWO-L12_TWO", "node2" : "INTERNAL_VL2_L12_TWO" }, { "node1" : "INTERNAL_VL2_L12_TWO", "node2" : "L12_TWO" }, { - "node1" : "INTERNAL_VL2_T12_TWO", + "node1" : "INTERNAL_VL2_BUSCO_B21_T12_TWO-T12_TWO", "node2" : "INTERNAL_VL2_T12_TWO" }, { "node1" : "INTERNAL_VL2_T12_TWO", "node2" : "T12_TWO" }, { - "node1" : "INTERNAL_VL2_T3_12_THREE", + "node1" : "INTERNAL_VL2_BUSCO_B21_T3_12_THREE-T3_12_THREE", "node2" : "INTERNAL_VL2_T3_12_THREE" }, { "node1" : "INTERNAL_VL2_T3_12_THREE", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg index 0db099cd6..dd9ca9106 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg @@ -148,30 +148,30 @@ BBS12 - + - + - + - + - + - + @@ -180,10 +180,10 @@ - + - + @@ -206,7 +206,7 @@ - + @@ -224,10 +224,10 @@ - + - + @@ -250,7 +250,7 @@ - + @@ -265,10 +265,10 @@ - + - + @@ -291,7 +291,7 @@ - + @@ -306,10 +306,10 @@ - + - + @@ -332,7 +332,7 @@ - + @@ -347,10 +347,10 @@ - + - + @@ -386,7 +386,7 @@ - + @@ -406,10 +406,10 @@ - + - + @@ -432,7 +432,7 @@ - + @@ -450,10 +450,10 @@ - + - + @@ -476,7 +476,7 @@ - + @@ -491,10 +491,10 @@ - + - + @@ -517,7 +517,7 @@ - + @@ -532,10 +532,10 @@ - + - + @@ -558,7 +558,7 @@ - + @@ -575,10 +575,10 @@ - + - + @@ -614,7 +614,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerH.json b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerH.json index 5f981677c..fdb6b91e4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerH.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerH.json @@ -312,84 +312,84 @@ "direction" : "TOP" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_D10-BR1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR12", + "id" : "INTERNAL_VL1_D11-BR12", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR14", + "id" : "INTERNAL_VL1_D13-BR14", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR16", + "id" : "INTERNAL_VL1_D15-BR16", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR18", + "id" : "INTERNAL_VL1_D17-BR18", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR20", + "id" : "INTERNAL_VL1_D19-BR20", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR22", + "id" : "INTERNAL_VL1_D20-BR1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_D21-BR22", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR24", + "id" : "INTERNAL_VL1_D23-BR24", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR26", + "id" : "INTERNAL_VL1_D25-BR26", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR28", + "id" : "INTERNAL_VL1_D27-BR28", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR30", + "id" : "INTERNAL_VL1_D29-BR30", "componentType" : "NODE", "fictitious" : true, "x" : 575.0, @@ -664,7 +664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D20", "INTERNAL_VL1_BR1" ] + "nodes" : [ "BBS12", "D20", "INTERNAL_VL1_D20-BR1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -685,7 +685,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_VL1_BR1", "BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "INTERNAL_VL1_D20-BR1", "BR1", "INTERNAL_VL1_D10-BR1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -706,7 +706,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D10", "INTERNAL_VL1_BR1" ] + "nodes" : [ "BBS11", "D10", "INTERNAL_VL1_D10-BR1" ] } ] } }, { @@ -753,7 +753,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D11", "INTERNAL_VL1_BR12" ] + "nodes" : [ "BBS11", "D11", "INTERNAL_VL1_D11-BR12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -774,7 +774,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR12", "BR12", "INTERNAL_VL1_L1" ] + "nodes" : [ "INTERNAL_VL1_D11-BR12", "BR12", "INTERNAL_VL1_L1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -842,7 +842,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D13", "INTERNAL_VL1_BR14" ] + "nodes" : [ "BBS11", "D13", "INTERNAL_VL1_D13-BR14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -863,7 +863,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR14", "BR14", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "INTERNAL_VL1_D13-BR14", "BR14", "INTERNAL_VL1_L11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -931,7 +931,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D15", "INTERNAL_VL1_BR16" ] + "nodes" : [ "BBS11", "D15", "INTERNAL_VL1_D15-BR16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -952,7 +952,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR16", "BR16", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D15-BR16", "BR16", "INTERNAL_VL1_L12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1020,7 +1020,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D17", "INTERNAL_VL1_BR18" ] + "nodes" : [ "BBS11", "D17", "INTERNAL_VL1_D17-BR18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1041,7 +1041,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR18", "BR18", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "INTERNAL_VL1_D17-BR18", "BR18", "INTERNAL_VL1_T11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1109,7 +1109,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D19", "INTERNAL_VL1_BR20" ] + "nodes" : [ "BBS11", "D19", "INTERNAL_VL1_D19-BR20" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1130,7 +1130,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR20", "BR20", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D19-BR20", "BR20", "INTERNAL_VL1_T3_12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1198,7 +1198,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D21", "INTERNAL_VL1_BR22" ] + "nodes" : [ "BBS12", "D21", "INTERNAL_VL1_D21-BR22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1219,7 +1219,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR22", "BR22", "INTERNAL_VL1_G" ] + "nodes" : [ "INTERNAL_VL1_D21-BR22", "BR22", "INTERNAL_VL1_G" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1287,7 +1287,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D23", "INTERNAL_VL1_BR24" ] + "nodes" : [ "BBS12", "D23", "INTERNAL_VL1_D23-BR24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1308,7 +1308,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR24", "BR24", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "INTERNAL_VL1_D23-BR24", "BR24", "INTERNAL_VL1_L11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1376,7 +1376,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D25", "INTERNAL_VL1_BR26" ] + "nodes" : [ "BBS12", "D25", "INTERNAL_VL1_D25-BR26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1397,7 +1397,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR26", "BR26", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "INTERNAL_VL1_D25-BR26", "BR26", "INTERNAL_VL1_T11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1465,7 +1465,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D27", "INTERNAL_VL1_BR28" ] + "nodes" : [ "BBS12", "D27", "INTERNAL_VL1_D27-BR28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1486,7 +1486,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR28", "BR28", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D27-BR28", "BR28", "INTERNAL_VL1_T12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1554,7 +1554,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D29", "INTERNAL_VL1_BR30" ] + "nodes" : [ "BBS12", "D29", "INTERNAL_VL1_D29-BR30" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1575,7 +1575,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR30", "BR30", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "INTERNAL_VL1_D29-BR30", "BR30", "INTERNAL_VL1_T3_12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1638,75 +1638,75 @@ "node2" : "D29" }, { "node1" : "D10", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_D10-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_D10-BR1", "node2" : "BR1" }, { "node1" : "D11", - "node2" : "INTERNAL_VL1_BR12" + "node2" : "INTERNAL_VL1_D11-BR12" }, { - "node1" : "INTERNAL_VL1_BR12", + "node1" : "INTERNAL_VL1_D11-BR12", "node2" : "BR12" }, { "node1" : "D13", - "node2" : "INTERNAL_VL1_BR14" + "node2" : "INTERNAL_VL1_D13-BR14" }, { - "node1" : "INTERNAL_VL1_BR14", + "node1" : "INTERNAL_VL1_D13-BR14", "node2" : "BR14" }, { "node1" : "D15", - "node2" : "INTERNAL_VL1_BR16" + "node2" : "INTERNAL_VL1_D15-BR16" }, { - "node1" : "INTERNAL_VL1_BR16", + "node1" : "INTERNAL_VL1_D15-BR16", "node2" : "BR16" }, { "node1" : "D17", - "node2" : "INTERNAL_VL1_BR18" + "node2" : "INTERNAL_VL1_D17-BR18" }, { - "node1" : "INTERNAL_VL1_BR18", + "node1" : "INTERNAL_VL1_D17-BR18", "node2" : "BR18" }, { "node1" : "D19", - "node2" : "INTERNAL_VL1_BR20" + "node2" : "INTERNAL_VL1_D19-BR20" }, { - "node1" : "INTERNAL_VL1_BR20", + "node1" : "INTERNAL_VL1_D19-BR20", "node2" : "BR20" }, { "node1" : "BR1", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_D20-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_D20-BR1", "node2" : "D20" }, { "node1" : "D21", - "node2" : "INTERNAL_VL1_BR22" + "node2" : "INTERNAL_VL1_D21-BR22" }, { - "node1" : "INTERNAL_VL1_BR22", + "node1" : "INTERNAL_VL1_D21-BR22", "node2" : "BR22" }, { "node1" : "D23", - "node2" : "INTERNAL_VL1_BR24" + "node2" : "INTERNAL_VL1_D23-BR24" }, { - "node1" : "INTERNAL_VL1_BR24", + "node1" : "INTERNAL_VL1_D23-BR24", "node2" : "BR24" }, { "node1" : "D25", - "node2" : "INTERNAL_VL1_BR26" + "node2" : "INTERNAL_VL1_D25-BR26" }, { - "node1" : "INTERNAL_VL1_BR26", + "node1" : "INTERNAL_VL1_D25-BR26", "node2" : "BR26" }, { "node1" : "D27", - "node2" : "INTERNAL_VL1_BR28" + "node2" : "INTERNAL_VL1_D27-BR28" }, { - "node1" : "INTERNAL_VL1_BR28", + "node1" : "INTERNAL_VL1_D27-BR28", "node2" : "BR28" }, { "node1" : "D29", - "node2" : "INTERNAL_VL1_BR30" + "node2" : "INTERNAL_VL1_D29-BR30" }, { - "node1" : "INTERNAL_VL1_BR30", + "node1" : "INTERNAL_VL1_D29-BR30", "node2" : "BR30" }, { "node1" : "BR12", @@ -1929,28 +1929,28 @@ "kind" : "DISCONNECTOR" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR32", + "id" : "INTERNAL_VL2_D31-BR32", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR34", + "id" : "INTERNAL_VL2_D33-BR34", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR36", + "id" : "INTERNAL_VL2_D35-BR36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR38", + "id" : "INTERNAL_VL2_D37-BR38", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -2094,7 +2094,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D31", "INTERNAL_VL2_BR32" ] + "nodes" : [ "BBS2", "D31", "INTERNAL_VL2_D31-BR32" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2115,7 +2115,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR32", "BR32", "INTERNAL_VL2_L2" ] + "nodes" : [ "INTERNAL_VL2_D31-BR32", "BR32", "INTERNAL_VL2_L2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2183,7 +2183,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D33", "INTERNAL_VL2_BR34" ] + "nodes" : [ "BBS2", "D33", "INTERNAL_VL2_D33-BR34" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR34", "BR34", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "INTERNAL_VL2_D33-BR34", "BR34", "INTERNAL_VL2_L12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2272,7 +2272,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D35", "INTERNAL_VL2_BR36" ] + "nodes" : [ "BBS2", "D35", "INTERNAL_VL2_D35-BR36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2293,7 +2293,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR36", "BR36", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "INTERNAL_VL2_D35-BR36", "BR36", "INTERNAL_VL2_T12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2361,7 +2361,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D37", "INTERNAL_VL2_BR38" ] + "nodes" : [ "BBS2", "D37", "INTERNAL_VL2_D37-BR38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2382,7 +2382,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR38", "BR38", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "INTERNAL_VL2_D37-BR38", "BR38", "INTERNAL_VL2_T3_12_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2421,27 +2421,27 @@ "node2" : "D37" }, { "node1" : "D31", - "node2" : "INTERNAL_VL2_BR32" + "node2" : "INTERNAL_VL2_D31-BR32" }, { - "node1" : "INTERNAL_VL2_BR32", + "node1" : "INTERNAL_VL2_D31-BR32", "node2" : "BR32" }, { "node1" : "D33", - "node2" : "INTERNAL_VL2_BR34" + "node2" : "INTERNAL_VL2_D33-BR34" }, { - "node1" : "INTERNAL_VL2_BR34", + "node1" : "INTERNAL_VL2_D33-BR34", "node2" : "BR34" }, { "node1" : "D35", - "node2" : "INTERNAL_VL2_BR36" + "node2" : "INTERNAL_VL2_D35-BR36" }, { - "node1" : "INTERNAL_VL2_BR36", + "node1" : "INTERNAL_VL2_D35-BR36", "node2" : "BR36" }, { "node1" : "D37", - "node2" : "INTERNAL_VL2_BR38" + "node2" : "INTERNAL_VL2_D37-BR38" }, { - "node1" : "INTERNAL_VL2_BR38", + "node1" : "INTERNAL_VL2_D37-BR38", "node2" : "BR38" }, { "node1" : "BR32", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerV.json b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerV.json index b3a7a670b..84882c540 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerV.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreakerV.json @@ -312,84 +312,84 @@ "direction" : "TOP" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", + "id" : "INTERNAL_VL1_D10-BR1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR12", + "id" : "INTERNAL_VL1_D11-BR12", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR14", + "id" : "INTERNAL_VL1_D13-BR14", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR16", + "id" : "INTERNAL_VL1_D15-BR16", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR18", + "id" : "INTERNAL_VL1_D17-BR18", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR20", + "id" : "INTERNAL_VL1_D19-BR20", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR22", + "id" : "INTERNAL_VL1_D20-BR1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_VL1_D21-BR22", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR24", + "id" : "INTERNAL_VL1_D23-BR24", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR26", + "id" : "INTERNAL_VL1_D25-BR26", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR28", + "id" : "INTERNAL_VL1_D27-BR28", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL1_BR30", + "id" : "INTERNAL_VL1_D29-BR30", "componentType" : "NODE", "fictitious" : true, "x" : 575.0, @@ -664,7 +664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D20", "INTERNAL_VL1_BR1" ] + "nodes" : [ "BBS12", "D20", "INTERNAL_VL1_D20-BR1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -685,7 +685,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_VL1_BR1", "BR1", "INTERNAL_VL1_BR1" ] + "nodes" : [ "INTERNAL_VL1_D20-BR1", "BR1", "INTERNAL_VL1_D10-BR1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -706,7 +706,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D10", "INTERNAL_VL1_BR1" ] + "nodes" : [ "BBS11", "D10", "INTERNAL_VL1_D10-BR1" ] } ] } }, { @@ -753,7 +753,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D11", "INTERNAL_VL1_BR12" ] + "nodes" : [ "BBS11", "D11", "INTERNAL_VL1_D11-BR12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -774,7 +774,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR12", "BR12", "INTERNAL_VL1_L1" ] + "nodes" : [ "INTERNAL_VL1_D11-BR12", "BR12", "INTERNAL_VL1_L1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -842,7 +842,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D13", "INTERNAL_VL1_BR14" ] + "nodes" : [ "BBS11", "D13", "INTERNAL_VL1_D13-BR14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -863,7 +863,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR14", "BR14", "INTERNAL_VL1_L11_ONE" ] + "nodes" : [ "INTERNAL_VL1_D13-BR14", "BR14", "INTERNAL_VL1_L11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -931,7 +931,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D15", "INTERNAL_VL1_BR16" ] + "nodes" : [ "BBS11", "D15", "INTERNAL_VL1_D15-BR16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -952,7 +952,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR16", "BR16", "INTERNAL_VL1_L12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D15-BR16", "BR16", "INTERNAL_VL1_L12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1020,7 +1020,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D17", "INTERNAL_VL1_BR18" ] + "nodes" : [ "BBS11", "D17", "INTERNAL_VL1_D17-BR18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1041,7 +1041,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR18", "BR18", "INTERNAL_VL1_T11_ONE" ] + "nodes" : [ "INTERNAL_VL1_D17-BR18", "BR18", "INTERNAL_VL1_T11_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1109,7 +1109,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS11", "D19", "INTERNAL_VL1_BR20" ] + "nodes" : [ "BBS11", "D19", "INTERNAL_VL1_D19-BR20" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1130,7 +1130,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR20", "BR20", "INTERNAL_VL1_T3_12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D19-BR20", "BR20", "INTERNAL_VL1_T3_12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1198,7 +1198,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D21", "INTERNAL_VL1_BR22" ] + "nodes" : [ "BBS12", "D21", "INTERNAL_VL1_D21-BR22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1219,7 +1219,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR22", "BR22", "INTERNAL_VL1_G" ] + "nodes" : [ "INTERNAL_VL1_D21-BR22", "BR22", "INTERNAL_VL1_G" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1287,7 +1287,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D23", "INTERNAL_VL1_BR24" ] + "nodes" : [ "BBS12", "D23", "INTERNAL_VL1_D23-BR24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1308,7 +1308,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR24", "BR24", "INTERNAL_VL1_L11_TWO" ] + "nodes" : [ "INTERNAL_VL1_D23-BR24", "BR24", "INTERNAL_VL1_L11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1376,7 +1376,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D25", "INTERNAL_VL1_BR26" ] + "nodes" : [ "BBS12", "D25", "INTERNAL_VL1_D25-BR26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1397,7 +1397,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR26", "BR26", "INTERNAL_VL1_T11_TWO" ] + "nodes" : [ "INTERNAL_VL1_D25-BR26", "BR26", "INTERNAL_VL1_T11_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1465,7 +1465,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D27", "INTERNAL_VL1_BR28" ] + "nodes" : [ "BBS12", "D27", "INTERNAL_VL1_D27-BR28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1486,7 +1486,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR28", "BR28", "INTERNAL_VL1_T12_ONE" ] + "nodes" : [ "INTERNAL_VL1_D27-BR28", "BR28", "INTERNAL_VL1_T12_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1554,7 +1554,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS12", "D29", "INTERNAL_VL1_BR30" ] + "nodes" : [ "BBS12", "D29", "INTERNAL_VL1_D29-BR30" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1575,7 +1575,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL1_BR30", "BR30", "INTERNAL_VL1_T3_12_TWO" ] + "nodes" : [ "INTERNAL_VL1_D29-BR30", "BR30", "INTERNAL_VL1_T3_12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1638,75 +1638,75 @@ "node2" : "D29" }, { "node1" : "D10", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_D10-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_D10-BR1", "node2" : "BR1" }, { "node1" : "D11", - "node2" : "INTERNAL_VL1_BR12" + "node2" : "INTERNAL_VL1_D11-BR12" }, { - "node1" : "INTERNAL_VL1_BR12", + "node1" : "INTERNAL_VL1_D11-BR12", "node2" : "BR12" }, { "node1" : "D13", - "node2" : "INTERNAL_VL1_BR14" + "node2" : "INTERNAL_VL1_D13-BR14" }, { - "node1" : "INTERNAL_VL1_BR14", + "node1" : "INTERNAL_VL1_D13-BR14", "node2" : "BR14" }, { "node1" : "D15", - "node2" : "INTERNAL_VL1_BR16" + "node2" : "INTERNAL_VL1_D15-BR16" }, { - "node1" : "INTERNAL_VL1_BR16", + "node1" : "INTERNAL_VL1_D15-BR16", "node2" : "BR16" }, { "node1" : "D17", - "node2" : "INTERNAL_VL1_BR18" + "node2" : "INTERNAL_VL1_D17-BR18" }, { - "node1" : "INTERNAL_VL1_BR18", + "node1" : "INTERNAL_VL1_D17-BR18", "node2" : "BR18" }, { "node1" : "D19", - "node2" : "INTERNAL_VL1_BR20" + "node2" : "INTERNAL_VL1_D19-BR20" }, { - "node1" : "INTERNAL_VL1_BR20", + "node1" : "INTERNAL_VL1_D19-BR20", "node2" : "BR20" }, { "node1" : "BR1", - "node2" : "INTERNAL_VL1_BR1" + "node2" : "INTERNAL_VL1_D20-BR1" }, { - "node1" : "INTERNAL_VL1_BR1", + "node1" : "INTERNAL_VL1_D20-BR1", "node2" : "D20" }, { "node1" : "D21", - "node2" : "INTERNAL_VL1_BR22" + "node2" : "INTERNAL_VL1_D21-BR22" }, { - "node1" : "INTERNAL_VL1_BR22", + "node1" : "INTERNAL_VL1_D21-BR22", "node2" : "BR22" }, { "node1" : "D23", - "node2" : "INTERNAL_VL1_BR24" + "node2" : "INTERNAL_VL1_D23-BR24" }, { - "node1" : "INTERNAL_VL1_BR24", + "node1" : "INTERNAL_VL1_D23-BR24", "node2" : "BR24" }, { "node1" : "D25", - "node2" : "INTERNAL_VL1_BR26" + "node2" : "INTERNAL_VL1_D25-BR26" }, { - "node1" : "INTERNAL_VL1_BR26", + "node1" : "INTERNAL_VL1_D25-BR26", "node2" : "BR26" }, { "node1" : "D27", - "node2" : "INTERNAL_VL1_BR28" + "node2" : "INTERNAL_VL1_D27-BR28" }, { - "node1" : "INTERNAL_VL1_BR28", + "node1" : "INTERNAL_VL1_D27-BR28", "node2" : "BR28" }, { "node1" : "D29", - "node2" : "INTERNAL_VL1_BR30" + "node2" : "INTERNAL_VL1_D29-BR30" }, { - "node1" : "INTERNAL_VL1_BR30", + "node1" : "INTERNAL_VL1_D29-BR30", "node2" : "BR30" }, { "node1" : "BR12", @@ -1929,28 +1929,28 @@ "kind" : "DISCONNECTOR" }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR32", + "id" : "INTERNAL_VL2_D31-BR32", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR34", + "id" : "INTERNAL_VL2_D33-BR34", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR36", + "id" : "INTERNAL_VL2_D35-BR36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_VL2_BR38", + "id" : "INTERNAL_VL2_D37-BR38", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -2094,7 +2094,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D31", "INTERNAL_VL2_BR32" ] + "nodes" : [ "BBS2", "D31", "INTERNAL_VL2_D31-BR32" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2115,7 +2115,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR32", "BR32", "INTERNAL_VL2_L2" ] + "nodes" : [ "INTERNAL_VL2_D31-BR32", "BR32", "INTERNAL_VL2_L2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2183,7 +2183,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D33", "INTERNAL_VL2_BR34" ] + "nodes" : [ "BBS2", "D33", "INTERNAL_VL2_D33-BR34" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR34", "BR34", "INTERNAL_VL2_L12_TWO" ] + "nodes" : [ "INTERNAL_VL2_D33-BR34", "BR34", "INTERNAL_VL2_L12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2272,7 +2272,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D35", "INTERNAL_VL2_BR36" ] + "nodes" : [ "BBS2", "D35", "INTERNAL_VL2_D35-BR36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2293,7 +2293,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR36", "BR36", "INTERNAL_VL2_T12_TWO" ] + "nodes" : [ "INTERNAL_VL2_D35-BR36", "BR36", "INTERNAL_VL2_T12_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2361,7 +2361,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "BBS2", "D37", "INTERNAL_VL2_BR38" ] + "nodes" : [ "BBS2", "D37", "INTERNAL_VL2_D37-BR38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2382,7 +2382,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_VL2_BR38", "BR38", "INTERNAL_VL2_T3_12_THREE" ] + "nodes" : [ "INTERNAL_VL2_D37-BR38", "BR38", "INTERNAL_VL2_T3_12_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2421,27 +2421,27 @@ "node2" : "D37" }, { "node1" : "D31", - "node2" : "INTERNAL_VL2_BR32" + "node2" : "INTERNAL_VL2_D31-BR32" }, { - "node1" : "INTERNAL_VL2_BR32", + "node1" : "INTERNAL_VL2_D31-BR32", "node2" : "BR32" }, { "node1" : "D33", - "node2" : "INTERNAL_VL2_BR34" + "node2" : "INTERNAL_VL2_D33-BR34" }, { - "node1" : "INTERNAL_VL2_BR34", + "node1" : "INTERNAL_VL2_D33-BR34", "node2" : "BR34" }, { "node1" : "D35", - "node2" : "INTERNAL_VL2_BR36" + "node2" : "INTERNAL_VL2_D35-BR36" }, { - "node1" : "INTERNAL_VL2_BR36", + "node1" : "INTERNAL_VL2_D35-BR36", "node2" : "BR36" }, { "node1" : "D37", - "node2" : "INTERNAL_VL2_BR38" + "node2" : "INTERNAL_VL2_D37-BR38" }, { - "node1" : "INTERNAL_VL2_BR38", + "node1" : "INTERNAL_VL2_D37-BR38", "node2" : "BR38" }, { "node1" : "BR32", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg index c78d1561b..6fb76b70c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg @@ -148,40 +148,40 @@ B12 - + - + - + - + - + - + - + - + - + - + @@ -197,10 +197,10 @@ — - + - + @@ -214,10 +214,10 @@ - + - + @@ -233,10 +233,10 @@ — - + - + @@ -250,10 +250,10 @@ - + - + @@ -269,10 +269,10 @@ — - + - + @@ -286,10 +286,10 @@ - + - + @@ -305,10 +305,10 @@ — - + - + @@ -322,10 +322,10 @@ - + - + @@ -354,10 +354,10 @@ — - + - + @@ -376,10 +376,10 @@ - + - + @@ -395,10 +395,10 @@ — - + - + @@ -412,10 +412,10 @@ - + - + @@ -431,10 +431,10 @@ — - + - + @@ -448,10 +448,10 @@ - + - + @@ -467,10 +467,10 @@ — - + - + @@ -484,10 +484,10 @@ - + - + @@ -503,10 +503,10 @@ — - + - + @@ -522,10 +522,10 @@ - + - + @@ -554,10 +554,10 @@ — - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg index c97e81411..e037199df 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg @@ -151,30 +151,30 @@ BBS12 - + - + - + - + - + - + @@ -183,10 +183,10 @@ - + - + @@ -209,7 +209,7 @@ - + @@ -227,10 +227,10 @@ - + - + @@ -253,7 +253,7 @@ - + @@ -271,10 +271,10 @@ - + - + @@ -297,7 +297,7 @@ - + @@ -315,10 +315,10 @@ - + - + @@ -341,7 +341,7 @@ - + @@ -359,10 +359,10 @@ - + - + @@ -385,7 +385,7 @@ - + @@ -403,10 +403,10 @@ - + - + @@ -429,7 +429,7 @@ - + @@ -447,10 +447,10 @@ - + - + @@ -473,7 +473,7 @@ - + @@ -491,10 +491,10 @@ - + - + @@ -517,7 +517,7 @@ - + @@ -535,10 +535,10 @@ - + - + @@ -561,7 +561,7 @@ - + @@ -579,10 +579,10 @@ - + - + @@ -605,7 +605,7 @@ - + @@ -643,10 +643,10 @@ BBS2 - + - + @@ -669,7 +669,7 @@ - + @@ -687,10 +687,10 @@ - + - + @@ -713,7 +713,7 @@ - + @@ -731,10 +731,10 @@ - + - + @@ -757,7 +757,7 @@ - + @@ -775,10 +775,10 @@ - + - + @@ -801,7 +801,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg index 110b46b39..f34063eff 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg @@ -148,16 +148,16 @@ BBS12 - + - + - + - + @@ -167,7 +167,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -189,10 +189,10 @@ - + - + @@ -218,7 +218,7 @@ - + @@ -239,10 +239,10 @@ - + - + @@ -268,7 +268,7 @@ - + @@ -286,10 +286,10 @@ - + - + @@ -315,7 +315,7 @@ - + @@ -333,10 +333,10 @@ - + - + @@ -362,7 +362,7 @@ - + @@ -380,10 +380,10 @@ - + - + @@ -422,7 +422,7 @@ - + @@ -445,10 +445,10 @@ - + - + @@ -474,7 +474,7 @@ - + @@ -495,10 +495,10 @@ - + - + @@ -524,7 +524,7 @@ - + @@ -542,10 +542,10 @@ - + - + @@ -571,7 +571,7 @@ - + @@ -589,10 +589,10 @@ - + - + @@ -618,7 +618,7 @@ - + @@ -638,10 +638,10 @@ - + - + @@ -680,7 +680,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.json index 4624385db..3d6a075fb 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -119,7 +119,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d", "INTERNAL_vl_d-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -140,7 +140,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_d-b", "b", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -170,9 +170,9 @@ "node2" : "d" }, { "node1" : "d", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d-b", "node2" : "b" }, { "node1" : "b", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg index 33c978540..a21c4b985 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg @@ -66,10 +66,10 @@ bbs - + - + @@ -94,7 +94,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg index 4c41c00a8..4650dfe67 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg @@ -150,10 +150,10 @@ - + - + @@ -162,14 +162,14 @@ - + - + @@ -180,10 +180,10 @@ - + - + @@ -192,14 +192,14 @@ - + - + @@ -207,10 +207,10 @@ - + - + @@ -232,7 +232,7 @@ - + @@ -248,10 +248,10 @@ - + - + @@ -273,7 +273,7 @@ - + @@ -288,10 +288,10 @@ - + - + @@ -313,7 +313,7 @@ - + @@ -328,10 +328,10 @@ - + - + @@ -353,7 +353,7 @@ - + @@ -368,10 +368,10 @@ - + - + @@ -393,7 +393,7 @@ - + @@ -408,10 +408,10 @@ - + - + @@ -433,7 +433,7 @@ - + @@ -449,10 +449,10 @@ - + - + @@ -474,7 +474,7 @@ - + @@ -489,10 +489,10 @@ - + - + @@ -514,7 +514,7 @@ - + @@ -529,10 +529,10 @@ - + - + @@ -554,7 +554,7 @@ - + @@ -570,10 +570,10 @@ - + - + @@ -595,7 +595,7 @@ - + @@ -610,10 +610,10 @@ - + - + @@ -635,7 +635,7 @@ - + @@ -650,10 +650,10 @@ - + - + @@ -675,7 +675,7 @@ - + @@ -691,10 +691,10 @@ - + - + @@ -716,7 +716,7 @@ - + @@ -742,29 +742,29 @@ bbs6 - + - + - + - + - + - + @@ -772,10 +772,10 @@ - + - + @@ -797,7 +797,7 @@ - + @@ -813,10 +813,10 @@ - + - + @@ -838,7 +838,7 @@ - + @@ -853,10 +853,10 @@ - + - + @@ -878,7 +878,7 @@ - + @@ -893,10 +893,10 @@ - + - + @@ -918,7 +918,7 @@ - + @@ -933,10 +933,10 @@ - + - + @@ -958,7 +958,7 @@ - + @@ -974,10 +974,10 @@ - + - + @@ -999,7 +999,7 @@ - + @@ -1014,10 +1014,10 @@ - + - + @@ -1039,7 +1039,7 @@ - + @@ -1054,10 +1054,10 @@ - + - + @@ -1079,7 +1079,7 @@ - + @@ -1094,10 +1094,10 @@ - + - + @@ -1119,7 +1119,7 @@ - + @@ -1141,10 +1141,10 @@ bbs7 - + - + @@ -1166,7 +1166,7 @@ - + @@ -1182,10 +1182,10 @@ - + - + @@ -1207,7 +1207,7 @@ - + @@ -1222,10 +1222,10 @@ - + - + @@ -1247,7 +1247,7 @@ - + @@ -1262,10 +1262,10 @@ - + - + @@ -1287,7 +1287,7 @@ - + @@ -1302,10 +1302,10 @@ - + - + @@ -1327,7 +1327,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Left3wtOrientation.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Left3wtOrientation.json index 897887510..12f80967b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Left3wtOrientation.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Left3wtOrientation.json @@ -10,7 +10,7 @@ "y" : 200.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 809.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "dload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "bload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "dgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "bgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 1388.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "dload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "bload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Right3wtOrientation.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Right3wtOrientation.json index 77f79d198..c1b642d67 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Right3wtOrientation.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11Right3wtOrientation.json @@ -10,7 +10,7 @@ "y" : 200.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 809.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "dload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "bload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "dgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "bgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 1388.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "dload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "bload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphH.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphH.json index ab154c749..3d9fa6cbc 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphH.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphH.json @@ -10,7 +10,7 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "dload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "bload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "dgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "bgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "dload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "bload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg index 79a60ab09..ed566561f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg @@ -162,10 +162,10 @@ - + - + @@ -175,14 +175,14 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -223,10 +223,10 @@ - + - + @@ -249,7 +249,7 @@ - + @@ -267,10 +267,10 @@ - + - + @@ -293,7 +293,7 @@ - + @@ -308,10 +308,10 @@ - + - + @@ -334,7 +334,7 @@ - + @@ -349,10 +349,10 @@ - + - + @@ -375,7 +375,7 @@ - + @@ -390,10 +390,10 @@ - + - + @@ -416,7 +416,7 @@ - + @@ -431,10 +431,10 @@ - + - + @@ -457,7 +457,7 @@ - + @@ -475,10 +475,10 @@ - + - + @@ -501,7 +501,7 @@ - + @@ -516,10 +516,10 @@ - + - + @@ -542,7 +542,7 @@ - + @@ -557,10 +557,10 @@ - + - + @@ -583,7 +583,7 @@ - + @@ -601,10 +601,10 @@ - + - + @@ -627,7 +627,7 @@ - + @@ -642,10 +642,10 @@ - + - + @@ -668,7 +668,7 @@ - + @@ -683,10 +683,10 @@ - + - + @@ -709,7 +709,7 @@ - + @@ -727,10 +727,10 @@ - + - + @@ -753,7 +753,7 @@ - + @@ -779,30 +779,30 @@ bbs6 - + - + - + - + - + - + @@ -811,10 +811,10 @@ - + - + @@ -837,7 +837,7 @@ - + @@ -855,10 +855,10 @@ - + - + @@ -881,7 +881,7 @@ - + @@ -896,10 +896,10 @@ - + - + @@ -922,7 +922,7 @@ - + @@ -937,10 +937,10 @@ - + - + @@ -963,7 +963,7 @@ - + @@ -978,10 +978,10 @@ - + - + @@ -1004,7 +1004,7 @@ - + @@ -1022,10 +1022,10 @@ - + - + @@ -1048,7 +1048,7 @@ - + @@ -1063,10 +1063,10 @@ - + - + @@ -1089,7 +1089,7 @@ - + @@ -1104,10 +1104,10 @@ - + - + @@ -1130,7 +1130,7 @@ - + @@ -1145,10 +1145,10 @@ - + - + @@ -1171,7 +1171,7 @@ - + @@ -1193,10 +1193,10 @@ bbs7 - + - + @@ -1219,7 +1219,7 @@ - + @@ -1237,10 +1237,10 @@ - + - + @@ -1263,7 +1263,7 @@ - + @@ -1278,10 +1278,10 @@ - + - + @@ -1304,7 +1304,7 @@ - + @@ -1319,10 +1319,10 @@ - + - + @@ -1345,7 +1345,7 @@ - + @@ -1360,10 +1360,10 @@ - + - + @@ -1386,7 +1386,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg index 7a5ebb2a8..314858278 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg @@ -162,10 +162,10 @@ - + - + @@ -175,14 +175,14 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -223,10 +223,10 @@ - + - + @@ -249,7 +249,7 @@ - + @@ -267,10 +267,10 @@ - + - + @@ -293,7 +293,7 @@ - + @@ -308,10 +308,10 @@ - + - + @@ -334,7 +334,7 @@ - + @@ -349,10 +349,10 @@ - + - + @@ -375,7 +375,7 @@ - + @@ -390,10 +390,10 @@ - + - + @@ -416,7 +416,7 @@ - + @@ -431,10 +431,10 @@ - + - + @@ -457,7 +457,7 @@ - + @@ -475,10 +475,10 @@ - + - + @@ -501,7 +501,7 @@ - + @@ -516,10 +516,10 @@ - + - + @@ -542,7 +542,7 @@ - + @@ -557,10 +557,10 @@ - + - + @@ -583,7 +583,7 @@ - + @@ -601,10 +601,10 @@ - + - + @@ -627,7 +627,7 @@ - + @@ -642,10 +642,10 @@ - + - + @@ -668,7 +668,7 @@ - + @@ -683,10 +683,10 @@ - + - + @@ -709,7 +709,7 @@ - + @@ -727,10 +727,10 @@ - + - + @@ -753,7 +753,7 @@ - + @@ -779,30 +779,30 @@ bbs6 - + - + - + - + - + - + @@ -811,10 +811,10 @@ - + - + @@ -837,7 +837,7 @@ - + @@ -855,10 +855,10 @@ - + - + @@ -881,7 +881,7 @@ - + @@ -896,10 +896,10 @@ - + - + @@ -922,7 +922,7 @@ - + @@ -937,10 +937,10 @@ - + - + @@ -963,7 +963,7 @@ - + @@ -978,10 +978,10 @@ - + - + @@ -1004,7 +1004,7 @@ - + @@ -1022,10 +1022,10 @@ - + - + @@ -1048,7 +1048,7 @@ - + @@ -1063,10 +1063,10 @@ - + - + @@ -1089,7 +1089,7 @@ - + @@ -1104,10 +1104,10 @@ - + - + @@ -1130,7 +1130,7 @@ - + @@ -1145,10 +1145,10 @@ - + - + @@ -1171,7 +1171,7 @@ - + @@ -1193,10 +1193,10 @@ bbs7 - + - + @@ -1219,7 +1219,7 @@ - + @@ -1237,10 +1237,10 @@ - + - + @@ -1263,7 +1263,7 @@ - + @@ -1278,10 +1278,10 @@ - + - + @@ -1304,7 +1304,7 @@ - + @@ -1319,10 +1319,10 @@ - + - + @@ -1345,7 +1345,7 @@ - + @@ -1360,10 +1360,10 @@ - + - + @@ -1386,7 +1386,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg index 2d0572871..970e6d976 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg @@ -162,10 +162,10 @@ - + - + @@ -175,14 +175,14 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -223,10 +223,10 @@ - + - + @@ -249,7 +249,7 @@ - + @@ -267,10 +267,10 @@ - + - + @@ -293,7 +293,7 @@ - + @@ -308,10 +308,10 @@ - + - + @@ -334,7 +334,7 @@ - + @@ -349,10 +349,10 @@ - + - + @@ -375,7 +375,7 @@ - + @@ -390,10 +390,10 @@ - + - + @@ -416,7 +416,7 @@ - + @@ -431,10 +431,10 @@ - + - + @@ -457,7 +457,7 @@ - + @@ -475,10 +475,10 @@ - + - + @@ -501,7 +501,7 @@ - + @@ -516,10 +516,10 @@ - + - + @@ -542,7 +542,7 @@ - + @@ -557,10 +557,10 @@ - + - + @@ -583,7 +583,7 @@ - + @@ -601,10 +601,10 @@ - + - + @@ -627,7 +627,7 @@ - + @@ -642,10 +642,10 @@ - + - + @@ -668,7 +668,7 @@ - + @@ -683,10 +683,10 @@ - + - + @@ -709,7 +709,7 @@ - + @@ -727,10 +727,10 @@ - + - + @@ -753,7 +753,7 @@ - + @@ -779,30 +779,30 @@ bbs6 - + - + - + - + - + - + @@ -811,10 +811,10 @@ - + - + @@ -837,7 +837,7 @@ - + @@ -855,10 +855,10 @@ - + - + @@ -881,7 +881,7 @@ - + @@ -896,10 +896,10 @@ - + - + @@ -922,7 +922,7 @@ - + @@ -937,10 +937,10 @@ - + - + @@ -963,7 +963,7 @@ - + @@ -978,10 +978,10 @@ - + - + @@ -1004,7 +1004,7 @@ - + @@ -1022,10 +1022,10 @@ - + - + @@ -1048,7 +1048,7 @@ - + @@ -1063,10 +1063,10 @@ - + - + @@ -1089,7 +1089,7 @@ - + @@ -1104,10 +1104,10 @@ - + - + @@ -1130,7 +1130,7 @@ - + @@ -1145,10 +1145,10 @@ - + - + @@ -1171,7 +1171,7 @@ - + @@ -1193,10 +1193,10 @@ bbs7 - + - + @@ -1219,7 +1219,7 @@ - + @@ -1237,10 +1237,10 @@ - + - + @@ -1263,7 +1263,7 @@ - + @@ -1278,10 +1278,10 @@ - + - + @@ -1304,7 +1304,7 @@ - + @@ -1319,10 +1319,10 @@ - + - + @@ -1345,7 +1345,7 @@ - + @@ -1360,10 +1360,10 @@ - + - + @@ -1386,7 +1386,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg index 79a60ab09..ed566561f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg @@ -162,10 +162,10 @@ - + - + @@ -175,14 +175,14 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -207,14 +207,14 @@ - + - + @@ -223,10 +223,10 @@ - + - + @@ -249,7 +249,7 @@ - + @@ -267,10 +267,10 @@ - + - + @@ -293,7 +293,7 @@ - + @@ -308,10 +308,10 @@ - + - + @@ -334,7 +334,7 @@ - + @@ -349,10 +349,10 @@ - + - + @@ -375,7 +375,7 @@ - + @@ -390,10 +390,10 @@ - + - + @@ -416,7 +416,7 @@ - + @@ -431,10 +431,10 @@ - + - + @@ -457,7 +457,7 @@ - + @@ -475,10 +475,10 @@ - + - + @@ -501,7 +501,7 @@ - + @@ -516,10 +516,10 @@ - + - + @@ -542,7 +542,7 @@ - + @@ -557,10 +557,10 @@ - + - + @@ -583,7 +583,7 @@ - + @@ -601,10 +601,10 @@ - + - + @@ -627,7 +627,7 @@ - + @@ -642,10 +642,10 @@ - + - + @@ -668,7 +668,7 @@ - + @@ -683,10 +683,10 @@ - + - + @@ -709,7 +709,7 @@ - + @@ -727,10 +727,10 @@ - + - + @@ -753,7 +753,7 @@ - + @@ -779,30 +779,30 @@ bbs6 - + - + - + - + - + - + @@ -811,10 +811,10 @@ - + - + @@ -837,7 +837,7 @@ - + @@ -855,10 +855,10 @@ - + - + @@ -881,7 +881,7 @@ - + @@ -896,10 +896,10 @@ - + - + @@ -922,7 +922,7 @@ - + @@ -937,10 +937,10 @@ - + - + @@ -963,7 +963,7 @@ - + @@ -978,10 +978,10 @@ - + - + @@ -1004,7 +1004,7 @@ - + @@ -1022,10 +1022,10 @@ - + - + @@ -1048,7 +1048,7 @@ - + @@ -1063,10 +1063,10 @@ - + - + @@ -1089,7 +1089,7 @@ - + @@ -1104,10 +1104,10 @@ - + - + @@ -1130,7 +1130,7 @@ - + @@ -1145,10 +1145,10 @@ - + - + @@ -1171,7 +1171,7 @@ - + @@ -1193,10 +1193,10 @@ bbs7 - + - + @@ -1219,7 +1219,7 @@ - + @@ -1237,10 +1237,10 @@ - + - + @@ -1263,7 +1263,7 @@ - + @@ -1278,10 +1278,10 @@ - + - + @@ -1304,7 +1304,7 @@ - + @@ -1319,10 +1319,10 @@ - + - + @@ -1345,7 +1345,7 @@ - + @@ -1360,10 +1360,10 @@ - + - + @@ -1386,7 +1386,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHRaw.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHRaw.json index d5ebd7eca..39c44a8d2 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHRaw.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHRaw.json @@ -10,7 +10,7 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "bload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "dload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "bgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "dgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 260.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "bload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "dload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphV.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphV.json index 6798f8f88..951625e8a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphV.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphV.json @@ -10,7 +10,7 @@ "y" : 200.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 809.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "dload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "bload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "dgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "bgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 1388.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "dload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "bload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphVRaw.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphVRaw.json index fbe3c7917..40bb57ad0 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphVRaw.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphVRaw.json @@ -10,7 +10,7 @@ "y" : 200.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -18,7 +18,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 675.0, @@ -26,116 +26,116 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bline11_2", + "id" : "INTERNAL_vl1_dline11_2-bline11_2", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 142.0 + "x" : 400.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 625.0, - "y" : 142.0 + "x" : 450.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 400.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 575.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 450.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 625.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 325.0, + "x" : 175.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 525.0, - "y" : 142.0 + "x" : 575.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 400.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 325.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 525.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -945,7 +945,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -966,7 +966,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -987,7 +987,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1034,7 +1034,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1055,7 +1055,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1076,7 +1076,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1124,7 +1124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1145,7 +1145,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1214,7 +1214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1235,7 +1235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "INTERNAL_vl1_trf6_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1484,7 +1484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_bline11_2" ] + "nodes" : [ "bbs1", "dline11_2", "INTERNAL_vl1_dline11_2-bline11_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1505,7 +1505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dline11_2-bline11_2", "bline11_2", "INTERNAL_vl1_line1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1574,7 +1574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1595,7 +1595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1664,7 +1664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1685,7 +1685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1754,7 +1754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1775,7 +1775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "INTERNAL_vl1_trf8_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1844,7 +1844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1865,7 +1865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1934,7 +1934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1955,7 +1955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2024,7 +2024,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2045,7 +2045,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "INTERNAL_vl1_trf7_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2114,7 +2114,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2135,7 +2135,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2204,7 +2204,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2225,7 +2225,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2303,105 +2303,105 @@ "node2" : "dline11_2" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dline11_2", - "node2" : "INTERNAL_vl1_bline11_2" + "node2" : "INTERNAL_vl1_dline11_2-bline11_2" }, { - "node1" : "INTERNAL_vl1_bline11_2", + "node1" : "INTERNAL_vl1_dline11_2-bline11_2", "node2" : "bline11_2" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", @@ -2495,7 +2495,7 @@ "y" : 809.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -2503,21 +2503,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 75.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 475.0, @@ -2525,7 +2539,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 525.0, @@ -2533,47 +2547,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 375.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 325.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 425.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 75.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -3124,7 +3124,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3145,7 +3145,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -3166,7 +3166,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -3214,7 +3214,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3235,7 +3235,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3304,7 +3304,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3325,7 +3325,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3394,7 +3394,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3415,7 +3415,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3484,7 +3484,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3505,7 +3505,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "INTERNAL_vl2_trf7_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3574,7 +3574,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3595,7 +3595,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3664,7 +3664,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3685,7 +3685,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3754,7 +3754,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3775,7 +3775,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3844,7 +3844,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3865,7 +3865,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "INTERNAL_vl2_trf6_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -3934,7 +3934,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -3955,7 +3955,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "INTERNAL_vl2_trf8_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4015,69 +4015,69 @@ "node2" : "dtrf28" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "bload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "dload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "bgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "dgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", @@ -4147,14 +4147,14 @@ "y" : 1388.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -4162,14 +4162,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -4177,7 +4177,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -4488,7 +4488,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4509,7 +4509,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4578,7 +4578,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4599,7 +4599,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4668,7 +4668,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4689,7 +4689,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "INTERNAL_vl3_trf6_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4758,7 +4758,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4779,7 +4779,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "INTERNAL_vl3_trf7_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4848,7 +4848,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -4869,7 +4869,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "INTERNAL_vl3_trf8_THREE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -4911,33 +4911,33 @@ "node2" : "dtrf38" }, { "node1" : "bload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "dload4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL1.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL1.json index e728338ec..a5e4c86d4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL1.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL1.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen1", + "id" : "INTERNAL_vl1_dgen1-bgen1", "componentType" : "NODE", "fictitious" : true, "x" : 200.0, @@ -16,7 +16,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bgen2", + "id" : "INTERNAL_vl1_dgen2-bgen2", "componentType" : "NODE", "fictitious" : true, "x" : 1240.0, @@ -24,109 +24,109 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload1", + "id" : "INTERNAL_vl1_dload1-bload1", "componentType" : "NODE", "fictitious" : true, "x" : 40.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bload2", + "id" : "INTERNAL_vl1_dload2-bload2", "componentType" : "NODE", "fictitious" : true, "x" : 840.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf11", + "id" : "INTERNAL_vl1_dsect11-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 120.0, - "y" : 142.0 + "x" : 720.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf12", + "id" : "INTERNAL_vl1_dsect12-dtrct11", "componentType" : "NODE", "fictitious" : true, - "x" : 1160.0, - "y" : 142.0 + "x" : 800.0, + "y" : 172.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf13", + "id" : "INTERNAL_vl1_dsect21-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 280.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 720.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf14", + "id" : "INTERNAL_vl1_dsect22-dtrct21", "componentType" : "NODE", "fictitious" : true, - "x" : 1080.0, - "y" : 227.0, - "orientation" : "DOWN" + "x" : 800.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf15", + "id" : "INTERNAL_vl1_dtrf11-btrf11", "componentType" : "NODE", "fictitious" : true, - "x" : 360.0, + "x" : 120.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf16", + "id" : "INTERNAL_vl1_dtrf12-btrf12", "componentType" : "NODE", "fictitious" : true, - "x" : 480.0, + "x" : 1160.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf17", + "id" : "INTERNAL_vl1_dtrf13-btrf13", "componentType" : "NODE", "fictitious" : true, - "x" : 640.0, + "x" : 280.0, "y" : 227.0, "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_btrf18", + "id" : "INTERNAL_vl1_dtrf14-btrf14", "componentType" : "NODE", "fictitious" : true, - "x" : 960.0, - "y" : 142.0 + "x" : 1080.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf15-btrf15", "componentType" : "NODE", "fictitious" : true, - "x" : 720.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 360.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct11", + "id" : "INTERNAL_vl1_dtrf16-btrf16", "componentType" : "NODE", "fictitious" : true, - "x" : 800.0, - "y" : 172.0, - "orientation" : "RIGHT" + "x" : 480.0, + "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf17-btrf17", "componentType" : "NODE", "fictitious" : true, - "x" : 720.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 640.0, + "y" : 227.0, + "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_dtrct21", + "id" : "INTERNAL_vl1_dtrf18-btrf18", "componentType" : "NODE", "fictitious" : true, - "x" : 800.0, - "y" : 197.0, - "orientation" : "RIGHT" + "x" : 960.0, + "y" : 142.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_gen1", @@ -997,7 +997,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs2", "dsect12", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1018,7 +1018,7 @@ "xSpan" : 80.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct11", "dtrct11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "INTERNAL_vl1_dsect11-dtrct11", "dtrct11", "INTERNAL_vl1_dsect12-dtrct11" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1039,7 +1039,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dtrct11" ] + "nodes" : [ "bbs1", "dsect11", "INTERNAL_vl1_dsect11-dtrct11" ] } ] } }, { @@ -1086,7 +1086,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs4", "dsect22", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1107,7 +1107,7 @@ "xSpan" : 80.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_dtrct21", "dtrct21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "INTERNAL_vl1_dsect21-dtrct21", "dtrct21", "INTERNAL_vl1_dsect22-dtrct21" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -1128,7 +1128,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dtrct21" ] + "nodes" : [ "bbs3", "dsect21", "INTERNAL_vl1_dsect21-dtrct21" ] } ] } }, { @@ -1176,7 +1176,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_bload1" ] + "nodes" : [ "bbs1", "dload1", "INTERNAL_vl1_dload1-bload1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1197,7 +1197,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload1", "bload1", "INTERNAL_vl1_load1" ] + "nodes" : [ "INTERNAL_vl1_dload1-bload1", "bload1", "INTERNAL_vl1_load1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1266,7 +1266,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_btrf11" ] + "nodes" : [ "bbs1", "dtrf11", "INTERNAL_vl1_dtrf11-btrf11" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1287,7 +1287,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf11-btrf11", "btrf11", "INTERNAL_vl1_trf1_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1356,7 +1356,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_btrf15" ] + "nodes" : [ "bbs1", "dtrf15", "INTERNAL_vl1_dtrf15-btrf15" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1377,7 +1377,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf15-btrf15", "btrf15", "INTERNAL_vl1_trf5_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1446,7 +1446,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_btrf16" ] + "nodes" : [ "bbs1", "dtrf16", "INTERNAL_vl1_dtrf16-btrf16" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1467,7 +1467,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf16", "btrf16", "trf6" ] + "nodes" : [ "INTERNAL_vl1_dtrf16-btrf16", "btrf16", "trf6" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1578,7 +1578,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_bload2" ] + "nodes" : [ "bbs2", "dload2", "INTERNAL_vl1_dload2-bload2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1599,7 +1599,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bload2", "bload2", "INTERNAL_vl1_load2" ] + "nodes" : [ "INTERNAL_vl1_dload2-bload2", "bload2", "INTERNAL_vl1_load2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1668,7 +1668,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_btrf12" ] + "nodes" : [ "bbs2", "dtrf12", "INTERNAL_vl1_dtrf12-btrf12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1689,7 +1689,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf12-btrf12", "btrf12", "INTERNAL_vl1_trf2_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1758,7 +1758,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_btrf18" ] + "nodes" : [ "bbs2", "dtrf18", "INTERNAL_vl1_dtrf18-btrf18" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1779,7 +1779,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf18", "btrf18", "trf8" ] + "nodes" : [ "INTERNAL_vl1_dtrf18-btrf18", "btrf18", "trf8" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1890,7 +1890,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_bgen1" ] + "nodes" : [ "bbs3", "dgen1", "INTERNAL_vl1_dgen1-bgen1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1911,7 +1911,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen1", "bgen1", "INTERNAL_vl1_gen1" ] + "nodes" : [ "INTERNAL_vl1_dgen1-bgen1", "bgen1", "INTERNAL_vl1_gen1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1980,7 +1980,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_btrf13" ] + "nodes" : [ "bbs3", "dtrf13", "INTERNAL_vl1_dtrf13-btrf13" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2001,7 +2001,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf13-btrf13", "btrf13", "INTERNAL_vl1_trf3_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2070,7 +2070,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_btrf17" ] + "nodes" : [ "bbs3", "dtrf17", "INTERNAL_vl1_dtrf17-btrf17" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2091,7 +2091,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf17", "btrf17", "trf7" ] + "nodes" : [ "INTERNAL_vl1_dtrf17-btrf17", "btrf17", "trf7" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -2202,7 +2202,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_bgen2" ] + "nodes" : [ "bbs4", "dgen2", "INTERNAL_vl1_dgen2-bgen2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2223,7 +2223,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_bgen2", "bgen2", "INTERNAL_vl1_gen2" ] + "nodes" : [ "INTERNAL_vl1_dgen2-bgen2", "bgen2", "INTERNAL_vl1_gen2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2292,7 +2292,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_btrf14" ] + "nodes" : [ "bbs4", "dtrf14", "INTERNAL_vl1_dtrf14-btrf14" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2313,7 +2313,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl1_btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] + "nodes" : [ "INTERNAL_vl1_dtrf14-btrf14", "btrf14", "INTERNAL_vl1_trf4_ONE" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -2415,99 +2415,99 @@ "node2" : "trf8" }, { "node1" : "dsect11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect11-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect11-dtrct11", "node2" : "dtrct11" }, { "node1" : "dload1", - "node2" : "INTERNAL_vl1_bload1" + "node2" : "INTERNAL_vl1_dload1-bload1" }, { - "node1" : "INTERNAL_vl1_bload1", + "node1" : "INTERNAL_vl1_dload1-bload1", "node2" : "bload1" }, { "node1" : "dtrf11", - "node2" : "INTERNAL_vl1_btrf11" + "node2" : "INTERNAL_vl1_dtrf11-btrf11" }, { - "node1" : "INTERNAL_vl1_btrf11", + "node1" : "INTERNAL_vl1_dtrf11-btrf11", "node2" : "btrf11" }, { "node1" : "dtrf15", - "node2" : "INTERNAL_vl1_btrf15" + "node2" : "INTERNAL_vl1_dtrf15-btrf15" }, { - "node1" : "INTERNAL_vl1_btrf15", + "node1" : "INTERNAL_vl1_dtrf15-btrf15", "node2" : "btrf15" }, { "node1" : "dtrf16", - "node2" : "INTERNAL_vl1_btrf16" + "node2" : "INTERNAL_vl1_dtrf16-btrf16" }, { - "node1" : "INTERNAL_vl1_btrf16", + "node1" : "INTERNAL_vl1_dtrf16-btrf16", "node2" : "btrf16" }, { "node1" : "dtrct11", - "node2" : "INTERNAL_vl1_dtrct11" + "node2" : "INTERNAL_vl1_dsect12-dtrct11" }, { - "node1" : "INTERNAL_vl1_dtrct11", + "node1" : "INTERNAL_vl1_dsect12-dtrct11", "node2" : "dsect12" }, { "node1" : "dload2", - "node2" : "INTERNAL_vl1_bload2" + "node2" : "INTERNAL_vl1_dload2-bload2" }, { - "node1" : "INTERNAL_vl1_bload2", + "node1" : "INTERNAL_vl1_dload2-bload2", "node2" : "bload2" }, { "node1" : "dtrf12", - "node2" : "INTERNAL_vl1_btrf12" + "node2" : "INTERNAL_vl1_dtrf12-btrf12" }, { - "node1" : "INTERNAL_vl1_btrf12", + "node1" : "INTERNAL_vl1_dtrf12-btrf12", "node2" : "btrf12" }, { "node1" : "dtrf18", - "node2" : "INTERNAL_vl1_btrf18" + "node2" : "INTERNAL_vl1_dtrf18-btrf18" }, { - "node1" : "INTERNAL_vl1_btrf18", + "node1" : "INTERNAL_vl1_dtrf18-btrf18", "node2" : "btrf18" }, { "node1" : "dsect21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect21-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect21-dtrct21", "node2" : "dtrct21" }, { "node1" : "dgen1", - "node2" : "INTERNAL_vl1_bgen1" + "node2" : "INTERNAL_vl1_dgen1-bgen1" }, { - "node1" : "INTERNAL_vl1_bgen1", + "node1" : "INTERNAL_vl1_dgen1-bgen1", "node2" : "bgen1" }, { "node1" : "dtrf13", - "node2" : "INTERNAL_vl1_btrf13" + "node2" : "INTERNAL_vl1_dtrf13-btrf13" }, { - "node1" : "INTERNAL_vl1_btrf13", + "node1" : "INTERNAL_vl1_dtrf13-btrf13", "node2" : "btrf13" }, { "node1" : "dtrf17", - "node2" : "INTERNAL_vl1_btrf17" + "node2" : "INTERNAL_vl1_dtrf17-btrf17" }, { - "node1" : "INTERNAL_vl1_btrf17", + "node1" : "INTERNAL_vl1_dtrf17-btrf17", "node2" : "btrf17" }, { "node1" : "dtrct21", - "node2" : "INTERNAL_vl1_dtrct21" + "node2" : "INTERNAL_vl1_dsect22-dtrct21" }, { - "node1" : "INTERNAL_vl1_dtrct21", + "node1" : "INTERNAL_vl1_dsect22-dtrct21", "node2" : "dsect22" }, { "node1" : "dgen2", - "node2" : "INTERNAL_vl1_bgen2" + "node2" : "INTERNAL_vl1_dgen2-bgen2" }, { - "node1" : "INTERNAL_vl1_bgen2", + "node1" : "INTERNAL_vl1_dgen2-bgen2", "node2" : "bgen2" }, { "node1" : "dtrf14", - "node2" : "INTERNAL_vl1_btrf14" + "node2" : "INTERNAL_vl1_dtrf14-btrf14" }, { - "node1" : "INTERNAL_vl1_btrf14", + "node1" : "INTERNAL_vl1_dtrf14-btrf14", "node2" : "btrf14" }, { "node1" : "load1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL2.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL2.json index 6e7528436..fe0794f9f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL2.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL2.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bgen4", + "id" : "INTERNAL_vl2_dgen4-bgen4", "componentType" : "NODE", "fictitious" : true, "x" : 360.0, @@ -16,21 +16,35 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_bload3", + "id" : "INTERNAL_vl2_dload3-bload3", "componentType" : "NODE", "fictitious" : true, "x" : 200.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf21", + "id" : "INTERNAL_vl2_dscpl1-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 120.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dscpl2-ddcpl1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 40.0, + "y" : 132.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_dtrf21-btrf21", "componentType" : "NODE", "fictitious" : true, "x" : 280.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf22", + "id" : "INTERNAL_vl2_dtrf22-btrf22", "componentType" : "NODE", "fictitious" : true, "x" : 1000.0, @@ -38,7 +52,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf23", + "id" : "INTERNAL_vl2_dtrf23-btrf23", "componentType" : "NODE", "fictitious" : true, "x" : 1080.0, @@ -46,47 +60,33 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf24", + "id" : "INTERNAL_vl2_dtrf24-btrf24", "componentType" : "NODE", "fictitious" : true, "x" : 440.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf26", + "id" : "INTERNAL_vl2_dtrf26-btrf26", "componentType" : "NODE", "fictitious" : true, "x" : 720.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf27", + "id" : "INTERNAL_vl2_dtrf27-btrf27", "componentType" : "NODE", "fictitious" : true, "x" : 560.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl2_btrf28", + "id" : "INTERNAL_vl2_dtrf28-btrf28", "componentType" : "NODE", "fictitious" : true, "x" : 880.0, "y" : 227.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 120.0, - "y" : 132.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ddcpl1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 40.0, - "y" : 132.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_gen4", @@ -746,7 +746,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs6", "dscpl2", "INTERNAL_vl2_dscpl2-ddcpl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -767,7 +767,7 @@ "xSpan" : 80.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ddcpl1", "ddcpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "INTERNAL_vl2_dscpl2-ddcpl1", "ddcpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -788,7 +788,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_ddcpl1" ] + "nodes" : [ "bbs5", "dscpl1", "INTERNAL_vl2_dscpl1-ddcpl1" ] } ] } }, { @@ -836,7 +836,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_bload3" ] + "nodes" : [ "bbs5", "dload3", "INTERNAL_vl2_dload3-bload3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -857,7 +857,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bload3", "bload3", "INTERNAL_vl2_load3" ] + "nodes" : [ "INTERNAL_vl2_dload3-bload3", "bload3", "INTERNAL_vl2_load3" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -926,7 +926,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_btrf21" ] + "nodes" : [ "bbs5", "dtrf21", "INTERNAL_vl2_dtrf21-btrf21" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -947,7 +947,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf21-btrf21", "btrf21", "INTERNAL_vl2_trf1_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1016,7 +1016,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_btrf24" ] + "nodes" : [ "bbs5", "dtrf24", "INTERNAL_vl2_dtrf24-btrf24" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1037,7 +1037,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf24-btrf24", "btrf24", "INTERNAL_vl2_trf4_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1106,7 +1106,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_btrf27" ] + "nodes" : [ "bbs5", "dtrf27", "INTERNAL_vl2_dtrf27-btrf27" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1127,7 +1127,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf27", "btrf27", "trf7" ] + "nodes" : [ "INTERNAL_vl2_dtrf27-btrf27", "btrf27", "trf7" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1238,7 +1238,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_bgen4" ] + "nodes" : [ "bbs6", "dgen4", "INTERNAL_vl2_dgen4-bgen4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1259,7 +1259,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_bgen4", "bgen4", "INTERNAL_vl2_gen4" ] + "nodes" : [ "INTERNAL_vl2_dgen4-bgen4", "bgen4", "INTERNAL_vl2_gen4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1328,7 +1328,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_btrf22" ] + "nodes" : [ "bbs6", "dtrf22", "INTERNAL_vl2_dtrf22-btrf22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1349,7 +1349,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf22-btrf22", "btrf22", "INTERNAL_vl2_trf2_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1418,7 +1418,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_btrf23" ] + "nodes" : [ "bbs6", "dtrf23", "INTERNAL_vl2_dtrf23-btrf23" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1439,7 +1439,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] + "nodes" : [ "INTERNAL_vl2_dtrf23-btrf23", "btrf23", "INTERNAL_vl2_trf3_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1508,7 +1508,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_btrf26" ] + "nodes" : [ "bbs6", "dtrf26", "INTERNAL_vl2_dtrf26-btrf26" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1529,7 +1529,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf26", "btrf26", "trf6" ] + "nodes" : [ "INTERNAL_vl2_dtrf26-btrf26", "btrf26", "trf6" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1640,7 +1640,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_btrf28" ] + "nodes" : [ "bbs6", "dtrf28", "INTERNAL_vl2_dtrf28-btrf28" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1661,7 +1661,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl2_btrf28", "btrf28", "trf8" ] + "nodes" : [ "INTERNAL_vl2_dtrf28-btrf28", "btrf28", "trf8" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1790,69 +1790,69 @@ "node2" : "trf8" }, { "node1" : "dscpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl1-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl1-ddcpl1", "node2" : "ddcpl1" }, { "node1" : "dload3", - "node2" : "INTERNAL_vl2_bload3" + "node2" : "INTERNAL_vl2_dload3-bload3" }, { - "node1" : "INTERNAL_vl2_bload3", + "node1" : "INTERNAL_vl2_dload3-bload3", "node2" : "bload3" }, { "node1" : "dtrf21", - "node2" : "INTERNAL_vl2_btrf21" + "node2" : "INTERNAL_vl2_dtrf21-btrf21" }, { - "node1" : "INTERNAL_vl2_btrf21", + "node1" : "INTERNAL_vl2_dtrf21-btrf21", "node2" : "btrf21" }, { "node1" : "dtrf24", - "node2" : "INTERNAL_vl2_btrf24" + "node2" : "INTERNAL_vl2_dtrf24-btrf24" }, { - "node1" : "INTERNAL_vl2_btrf24", + "node1" : "INTERNAL_vl2_dtrf24-btrf24", "node2" : "btrf24" }, { "node1" : "dtrf27", - "node2" : "INTERNAL_vl2_btrf27" + "node2" : "INTERNAL_vl2_dtrf27-btrf27" }, { - "node1" : "INTERNAL_vl2_btrf27", + "node1" : "INTERNAL_vl2_dtrf27-btrf27", "node2" : "btrf27" }, { "node1" : "ddcpl1", - "node2" : "INTERNAL_vl2_ddcpl1" + "node2" : "INTERNAL_vl2_dscpl2-ddcpl1" }, { - "node1" : "INTERNAL_vl2_ddcpl1", + "node1" : "INTERNAL_vl2_dscpl2-ddcpl1", "node2" : "dscpl2" }, { "node1" : "dgen4", - "node2" : "INTERNAL_vl2_bgen4" + "node2" : "INTERNAL_vl2_dgen4-bgen4" }, { - "node1" : "INTERNAL_vl2_bgen4", + "node1" : "INTERNAL_vl2_dgen4-bgen4", "node2" : "bgen4" }, { "node1" : "dtrf22", - "node2" : "INTERNAL_vl2_btrf22" + "node2" : "INTERNAL_vl2_dtrf22-btrf22" }, { - "node1" : "INTERNAL_vl2_btrf22", + "node1" : "INTERNAL_vl2_dtrf22-btrf22", "node2" : "btrf22" }, { "node1" : "dtrf23", - "node2" : "INTERNAL_vl2_btrf23" + "node2" : "INTERNAL_vl2_dtrf23-btrf23" }, { - "node1" : "INTERNAL_vl2_btrf23", + "node1" : "INTERNAL_vl2_dtrf23-btrf23", "node2" : "btrf23" }, { "node1" : "dtrf26", - "node2" : "INTERNAL_vl2_btrf26" + "node2" : "INTERNAL_vl2_dtrf26-btrf26" }, { - "node1" : "INTERNAL_vl2_btrf26", + "node1" : "INTERNAL_vl2_dtrf26-btrf26", "node2" : "btrf26" }, { "node1" : "dtrf28", - "node2" : "INTERNAL_vl2_btrf28" + "node2" : "INTERNAL_vl2_dtrf28-btrf28" }, { - "node1" : "INTERNAL_vl2_btrf28", + "node1" : "INTERNAL_vl2_dtrf28-btrf28", "node2" : "btrf28" }, { "node1" : "load3", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL3.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL3.json index fdd1b4606..c73c783ba 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL3.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphVL3.json @@ -8,14 +8,14 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bload4", + "id" : "INTERNAL_vl3_dload4-bload4", "componentType" : "NODE", "fictitious" : true, "x" : 40.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bself4", + "id" : "INTERNAL_vl3_dself4-bself4", "componentType" : "NODE", "fictitious" : true, "x" : 120.0, @@ -23,7 +23,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bself5", + "id" : "INTERNAL_vl3_dself5-bself5", "componentType" : "NODE", "fictitious" : true, "x" : 760.0, @@ -31,7 +31,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_bself6", + "id" : "INTERNAL_vl3_dself6-bself6", "componentType" : "NODE", "fictitious" : true, "x" : 840.0, @@ -39,7 +39,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf25", + "id" : "INTERNAL_vl3_dtrf25-btrf25", "componentType" : "NODE", "fictitious" : true, "x" : 200.0, @@ -47,14 +47,14 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf36", + "id" : "INTERNAL_vl3_dtrf36-btrf36", "componentType" : "NODE", "fictitious" : true, "x" : 320.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf37", + "id" : "INTERNAL_vl3_dtrf37-btrf37", "componentType" : "NODE", "fictitious" : true, "x" : 480.0, @@ -62,7 +62,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl3_btrf38", + "id" : "INTERNAL_vl3_dtrf38-btrf38", "componentType" : "NODE", "fictitious" : true, "x" : 640.0, @@ -638,7 +638,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_bload4" ] + "nodes" : [ "bbs7", "dload4", "INTERNAL_vl3_dload4-bload4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -659,7 +659,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bload4", "bload4", "INTERNAL_vl3_load4" ] + "nodes" : [ "INTERNAL_vl3_dload4-bload4", "bload4", "INTERNAL_vl3_load4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -728,7 +728,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dself4", "INTERNAL_vl3_bself4" ] + "nodes" : [ "bbs7", "dself4", "INTERNAL_vl3_dself4-bself4" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -749,7 +749,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bself4", "bself4", "INTERNAL_vl3_self4" ] + "nodes" : [ "INTERNAL_vl3_dself4-bself4", "bself4", "INTERNAL_vl3_self4" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -818,7 +818,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_btrf25" ] + "nodes" : [ "bbs7", "dtrf25", "INTERNAL_vl3_dtrf25-btrf25" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -839,7 +839,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] + "nodes" : [ "INTERNAL_vl3_dtrf25-btrf25", "btrf25", "INTERNAL_vl3_trf5_TWO" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -908,7 +908,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_btrf36" ] + "nodes" : [ "bbs7", "dtrf36", "INTERNAL_vl3_dtrf36-btrf36" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -929,7 +929,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf36", "btrf36", "trf6" ] + "nodes" : [ "INTERNAL_vl3_dtrf36-btrf36", "btrf36", "trf6" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1040,7 +1040,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_btrf37" ] + "nodes" : [ "bbs7", "dtrf37", "INTERNAL_vl3_dtrf37-btrf37" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1061,7 +1061,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf37", "btrf37", "trf7" ] + "nodes" : [ "INTERNAL_vl3_dtrf37-btrf37", "btrf37", "trf7" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1172,7 +1172,7 @@ "xSpan" : 160.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_btrf38" ] + "nodes" : [ "bbs7", "dtrf38", "INTERNAL_vl3_dtrf38-btrf38" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1193,7 +1193,7 @@ "xSpan" : 160.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_btrf38", "btrf38", "trf8" ] + "nodes" : [ "INTERNAL_vl3_dtrf38-btrf38", "btrf38", "trf8" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -1304,7 +1304,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs7", "dself5", "INTERNAL_vl3_bself5" ] + "nodes" : [ "bbs7", "dself5", "INTERNAL_vl3_dself5-bself5" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1325,7 +1325,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bself5", "bself5", "INTERNAL_vl3_self5" ] + "nodes" : [ "INTERNAL_vl3_dself5-bself5", "bself5", "INTERNAL_vl3_self5" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1394,7 +1394,7 @@ "xSpan" : 80.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs8", "dself6", "INTERNAL_vl3_bself6" ] + "nodes" : [ "bbs8", "dself6", "INTERNAL_vl3_dself6-bself6" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -1415,7 +1415,7 @@ "xSpan" : 80.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl3_bself6", "bself6", "INTERNAL_vl3_self6" ] + "nodes" : [ "INTERNAL_vl3_dself6-bself6", "bself6", "INTERNAL_vl3_self6" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -1493,51 +1493,51 @@ "node2" : "dself6" }, { "node1" : "dload4", - "node2" : "INTERNAL_vl3_bload4" + "node2" : "INTERNAL_vl3_dload4-bload4" }, { - "node1" : "INTERNAL_vl3_bload4", + "node1" : "INTERNAL_vl3_dload4-bload4", "node2" : "bload4" }, { "node1" : "dself4", - "node2" : "INTERNAL_vl3_bself4" + "node2" : "INTERNAL_vl3_dself4-bself4" }, { - "node1" : "INTERNAL_vl3_bself4", + "node1" : "INTERNAL_vl3_dself4-bself4", "node2" : "bself4" }, { "node1" : "dtrf25", - "node2" : "INTERNAL_vl3_btrf25" + "node2" : "INTERNAL_vl3_dtrf25-btrf25" }, { - "node1" : "INTERNAL_vl3_btrf25", + "node1" : "INTERNAL_vl3_dtrf25-btrf25", "node2" : "btrf25" }, { "node1" : "dtrf36", - "node2" : "INTERNAL_vl3_btrf36" + "node2" : "INTERNAL_vl3_dtrf36-btrf36" }, { - "node1" : "INTERNAL_vl3_btrf36", + "node1" : "INTERNAL_vl3_dtrf36-btrf36", "node2" : "btrf36" }, { "node1" : "dtrf37", - "node2" : "INTERNAL_vl3_btrf37" + "node2" : "INTERNAL_vl3_dtrf37-btrf37" }, { - "node1" : "INTERNAL_vl3_btrf37", + "node1" : "INTERNAL_vl3_dtrf37-btrf37", "node2" : "btrf37" }, { "node1" : "dtrf38", - "node2" : "INTERNAL_vl3_btrf38" + "node2" : "INTERNAL_vl3_dtrf38-btrf38" }, { - "node1" : "INTERNAL_vl3_btrf38", + "node1" : "INTERNAL_vl3_dtrf38-btrf38", "node2" : "btrf38" }, { "node1" : "dself5", - "node2" : "INTERNAL_vl3_bself5" + "node2" : "INTERNAL_vl3_dself5-bself5" }, { - "node1" : "INTERNAL_vl3_bself5", + "node1" : "INTERNAL_vl3_dself5-bself5", "node2" : "bself5" }, { "node1" : "dself6", - "node2" : "INTERNAL_vl3_bself6" + "node2" : "INTERNAL_vl3_dself6-bself6" }, { - "node1" : "INTERNAL_vl3_bself6", + "node1" : "INTERNAL_vl3_dself6-bself6", "node2" : "bself6" }, { "node1" : "bload4", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg index 1adddc4ac..ffc43558f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg @@ -95,10 +95,10 @@ - + - + @@ -108,14 +108,14 @@ - + - + @@ -127,10 +127,10 @@ - + - + @@ -140,14 +140,14 @@ - + - + @@ -156,10 +156,10 @@ - + - + @@ -182,7 +182,7 @@ - + @@ -200,10 +200,10 @@ - + - + @@ -226,7 +226,7 @@ - + @@ -243,10 +243,10 @@ - + - + @@ -269,7 +269,7 @@ - + @@ -286,10 +286,10 @@ - + - + @@ -325,7 +325,7 @@ - + @@ -345,10 +345,10 @@ - + - + @@ -371,7 +371,7 @@ - + @@ -389,10 +389,10 @@ - + - + @@ -415,7 +415,7 @@ - + @@ -432,10 +432,10 @@ - + - + @@ -471,7 +471,7 @@ - + @@ -491,10 +491,10 @@ - + - + @@ -517,7 +517,7 @@ - + @@ -535,10 +535,10 @@ - + - + @@ -561,7 +561,7 @@ - + @@ -578,10 +578,10 @@ - + - + @@ -617,7 +617,7 @@ - + @@ -637,10 +637,10 @@ - + - + @@ -663,7 +663,7 @@ - + @@ -681,10 +681,10 @@ - + - + @@ -707,7 +707,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg index 3b22ece41..d722be6bf 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg @@ -159,10 +159,10 @@ - + - + @@ -172,14 +172,14 @@ - + - + @@ -191,10 +191,10 @@ - + - + @@ -204,14 +204,14 @@ - + - + @@ -220,10 +220,10 @@ - + - + @@ -246,7 +246,7 @@ - + @@ -264,10 +264,10 @@ - + - + @@ -290,7 +290,7 @@ - + @@ -307,10 +307,10 @@ - + - + @@ -333,7 +333,7 @@ - + @@ -350,10 +350,10 @@ - + - + @@ -389,7 +389,7 @@ - + @@ -409,10 +409,10 @@ - + - + @@ -435,7 +435,7 @@ - + @@ -453,10 +453,10 @@ - + - + @@ -479,7 +479,7 @@ - + @@ -496,10 +496,10 @@ - + - + @@ -535,7 +535,7 @@ - + @@ -555,10 +555,10 @@ - + - + @@ -581,7 +581,7 @@ - + @@ -599,10 +599,10 @@ - + - + @@ -625,7 +625,7 @@ - + @@ -642,10 +642,10 @@ - + - + @@ -681,7 +681,7 @@ - + @@ -701,10 +701,10 @@ - + - + @@ -727,7 +727,7 @@ - + @@ -745,10 +745,10 @@ - + - + @@ -771,7 +771,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg index 526713416..bbb72bd21 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg @@ -249,22 +249,22 @@ - + - + - + - + - + - + @@ -303,30 +303,30 @@ - + - + - + - + - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg index dcf402de1..847f2c6b0 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg @@ -337,22 +337,22 @@ - + - + - + - + - + - + @@ -391,30 +391,30 @@ - + - + - + - + - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg index 61ff2254d..e3972d0d2 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg @@ -235,22 +235,22 @@ - + - + - + - + - + - + @@ -289,30 +289,30 @@ - + - + - + - + - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1BusBreaker.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1BusBreaker.json index 3181592aa..4c58a4682 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1BusBreaker.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1BusBreaker.json @@ -8,53 +8,53 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_l", + "id" : "BUSCO_b1_l", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 125.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_sw", + "id" : "BUSCO_b1_sw", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_sw", + "id" : "BUSCO_b2_sw", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 25.0, "y" : 197.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_l", + "id" : "INTERNAL_vl_BUSCO_b1_l-l", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_l", + "id" : "INTERNAL_vl_BUSCO_b1_sw-sw", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 62.0 + "x" : 75.0, + "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_sw", + "id" : "INTERNAL_vl_BUSCO_b2_sw-sw", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, + "x" : 25.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_sw", + "id" : "INTERNAL_vl_l", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 132.0 + "x" : 125.0, + "y" : 62.0 }, { "type" : "BUS", "id" : "b1", @@ -159,7 +159,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "b2", "BUSCO_sw", "INTERNAL_vl_sw" ] + "nodes" : [ "b2", "BUSCO_b2_sw", "INTERNAL_vl_BUSCO_b2_sw-sw" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -180,7 +180,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_sw", "sw", "INTERNAL_vl_sw" ] + "nodes" : [ "INTERNAL_vl_BUSCO_b2_sw-sw", "sw", "INTERNAL_vl_BUSCO_b1_sw-sw" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -201,7 +201,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "b1", "BUSCO_sw", "INTERNAL_vl_sw" ] + "nodes" : [ "b1", "BUSCO_b1_sw", "INTERNAL_vl_BUSCO_b1_sw-sw" ] } ] } }, { @@ -249,7 +249,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "b1", "BUSCO_l", "INTERNAL_vl_l" ] + "nodes" : [ "b1", "BUSCO_b1_l", "INTERNAL_vl_BUSCO_b1_l-l" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -270,7 +270,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_l", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_BUSCO_b1_l-l", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -297,30 +297,30 @@ } ], "edges" : [ { "node1" : "b1", - "node2" : "BUSCO_l" + "node2" : "BUSCO_b1_l" }, { "node1" : "b1", - "node2" : "BUSCO_sw" + "node2" : "BUSCO_b1_sw" }, { - "node1" : "BUSCO_sw", + "node1" : "BUSCO_b2_sw", "node2" : "b2" }, { - "node1" : "BUSCO_l", - "node2" : "INTERNAL_vl_l" + "node1" : "BUSCO_b1_l", + "node2" : "INTERNAL_vl_BUSCO_b1_l-l" }, { - "node1" : "BUSCO_sw", - "node2" : "INTERNAL_vl_sw" + "node1" : "BUSCO_b1_sw", + "node2" : "INTERNAL_vl_BUSCO_b1_sw-sw" }, { - "node1" : "INTERNAL_vl_sw", + "node1" : "INTERNAL_vl_BUSCO_b1_sw-sw", "node2" : "sw" }, { "node1" : "sw", - "node2" : "INTERNAL_vl_sw" + "node2" : "INTERNAL_vl_BUSCO_b2_sw-sw" }, { - "node1" : "INTERNAL_vl_sw", - "node2" : "BUSCO_sw" + "node1" : "INTERNAL_vl_BUSCO_b2_sw-sw", + "node2" : "BUSCO_b2_sw" }, { - "node1" : "INTERNAL_vl_l", + "node1" : "INTERNAL_vl_BUSCO_b1_l-l", "node2" : "INTERNAL_vl_l" }, { "node1" : "INTERNAL_vl_l", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1inverted.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1inverted.json index 4624385db..3d6a075fb 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1inverted.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1inverted.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -119,7 +119,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d", "INTERNAL_vl_d-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -140,7 +140,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_d-b", "b", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -170,9 +170,9 @@ "node2" : "d" }, { "node1" : "d", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d-b", "node2" : "b" }, { "node1" : "b", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling.json index d7a25a8b6..2c9636b03 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling.json @@ -8,14 +8,14 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d2-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -134,7 +134,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d2", "INTERNAL_vl_b" ] + "nodes" : [ "bbs2", "d2", "INTERNAL_vl_d2-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -155,7 +155,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_d2-b", "b", "INTERNAL_vl_d1-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -176,7 +176,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b" ] } ] } } ], @@ -188,15 +188,15 @@ "node2" : "bbs2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { "node1" : "b", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d2-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d2-b", "node2" : "d2" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars.json index a3b4186c4..825d1dbe5 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars.json @@ -15,7 +15,7 @@ "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -226,7 +226,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_2", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_2", "b", "INTERNAL_vl_d1-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -247,7 +247,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b" ] } ] } } ], @@ -271,9 +271,9 @@ "node2" : "bbs3" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars2Sections.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars2Sections.json index 45c604f3c..a2be802fe 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars2Sections.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3Coupling3Bars2Sections.json @@ -15,7 +15,7 @@ "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -226,7 +226,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_2" ] + "nodes" : [ "INTERNAL_vl_d1-b", "b", "INTERNAL_vl_2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -247,7 +247,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b" ] } ] } } ], @@ -271,9 +271,9 @@ "node2" : "bbs3" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling.json index 059609356..4d220fe9d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling.json @@ -15,35 +15,35 @@ "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d2-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_d5-b2", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b3", + "id" : "INTERNAL_vl_d6-b3", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b3", + "id" : "INTERNAL_vl_d7-b3", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -241,7 +241,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d2", "INTERNAL_vl_b" ] + "nodes" : [ "bbs2", "d2", "INTERNAL_vl_d2-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -262,7 +262,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_d2-b", "b", "INTERNAL_vl_d1-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -283,7 +283,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b" ] } ] } }, { @@ -392,7 +392,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_4", "b2", "INTERNAL_vl_b2" ] + "nodes" : [ "INTERNAL_vl_4", "b2", "INTERNAL_vl_d5-b2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -413,7 +413,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d5", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs2", "d5", "INTERNAL_vl_d5-b2" ] } ] } }, { @@ -459,7 +459,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d7", "INTERNAL_vl_b3" ] + "nodes" : [ "bbs2", "d7", "INTERNAL_vl_d7-b3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -480,7 +480,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b3", "b3", "INTERNAL_vl_b3" ] + "nodes" : [ "INTERNAL_vl_d7-b3", "b3", "INTERNAL_vl_d6-b3" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -501,7 +501,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d6", "INTERNAL_vl_b3" ] + "nodes" : [ "bbs1", "d6", "INTERNAL_vl_d6-b3" ] } ] } } ], @@ -537,33 +537,33 @@ "node2" : "bbs2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { "node1" : "d6", - "node2" : "INTERNAL_vl_b3" + "node2" : "INTERNAL_vl_d6-b3" }, { - "node1" : "INTERNAL_vl_b3", + "node1" : "INTERNAL_vl_d6-b3", "node2" : "b3" }, { "node1" : "b", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d2-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d2-b", "node2" : "d2" }, { "node1" : "b2", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_d5-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_d5-b2", "node2" : "d5" }, { "node1" : "b3", - "node2" : "INTERNAL_vl_b3" + "node2" : "INTERNAL_vl_d7-b3" }, { - "node1" : "INTERNAL_vl_b3", + "node1" : "INTERNAL_vl_d7-b3", "node2" : "d7" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling_disconnectorOpen.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling_disconnectorOpen.json index 8998f4a14..c17893f37 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling_disconnectorOpen.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase3TripleCoupling_disconnectorOpen.json @@ -15,35 +15,35 @@ "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d2-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_d5-b2", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b3", + "id" : "INTERNAL_vl_d6-b3", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b3", + "id" : "INTERNAL_vl_d7-b3", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -241,7 +241,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d2", "INTERNAL_vl_b" ] + "nodes" : [ "bbs2", "d2", "INTERNAL_vl_d2-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -262,7 +262,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_d2-b", "b", "INTERNAL_vl_d1-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -283,7 +283,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b" ] } ] } }, { @@ -392,7 +392,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_4", "b2", "INTERNAL_vl_b2" ] + "nodes" : [ "INTERNAL_vl_4", "b2", "INTERNAL_vl_d5-b2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -413,7 +413,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d5", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs2", "d5", "INTERNAL_vl_d5-b2" ] } ] } }, { @@ -459,7 +459,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d7", "INTERNAL_vl_b3" ] + "nodes" : [ "bbs2", "d7", "INTERNAL_vl_d7-b3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -480,7 +480,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b3", "b3", "INTERNAL_vl_b3" ] + "nodes" : [ "INTERNAL_vl_d7-b3", "b3", "INTERNAL_vl_d6-b3" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -501,7 +501,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d6", "INTERNAL_vl_b3" ] + "nodes" : [ "bbs1", "d6", "INTERNAL_vl_d6-b3" ] } ] } } ], @@ -537,33 +537,33 @@ "node2" : "bbs2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { "node1" : "d6", - "node2" : "INTERNAL_vl_b3" + "node2" : "INTERNAL_vl_d6-b3" }, { - "node1" : "INTERNAL_vl_b3", + "node1" : "INTERNAL_vl_d6-b3", "node2" : "b3" }, { "node1" : "b", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d2-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d2-b", "node2" : "d2" }, { "node1" : "b2", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_d5-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_d5-b2", "node2" : "d5" }, { "node1" : "b3", - "node2" : "INTERNAL_vl_b3" + "node2" : "INTERNAL_vl_d7-b3" }, { - "node1" : "INTERNAL_vl_b3", + "node1" : "INTERNAL_vl_d7-b3", "node2" : "d7" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase4NotParallelel.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase4NotParallelel.json index 89d0bd1bc..78dd286b7 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase4NotParallelel.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase4NotParallelel.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs1.1_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs1.2_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -39,7 +39,23 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bc", + "id" : "INTERNAL_vl_BUSCO_bbs1.1_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 50.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl_BUSCO_bbs1.2_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 100.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl_dc1-bc", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, @@ -66,22 +82,6 @@ "x" : 125.0, "y" : 307.0, "orientation" : "DOWN" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 50.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 100.0, - "y" : 172.0, - "orientation" : "RIGHT" }, { "type" : "SWITCH", "id" : "ba", @@ -324,7 +324,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.2", "BUSCO_ss1", "INTERNAL_vl_ss1" ] + "nodes" : [ "bbs1.2", "BUSCO_bbs1.2_ss1", "INTERNAL_vl_BUSCO_bbs1.2_ss1-ss1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -345,7 +345,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_ss1", "ss1", "INTERNAL_vl_ss1" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs1.1_ss1-ss1", "ss1", "INTERNAL_vl_BUSCO_bbs1.2_ss1-ss1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -366,7 +366,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.1", "BUSCO_ss1", "INTERNAL_vl_ss1" ] + "nodes" : [ "bbs1.1", "BUSCO_bbs1.1_ss1", "INTERNAL_vl_BUSCO_bbs1.1_ss1-ss1" ] } ] } }, { @@ -678,7 +678,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.2", "dc1", "INTERNAL_vl_bc" ] + "nodes" : [ "bbs1.2", "dc1", "INTERNAL_vl_dc1-bc" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -699,7 +699,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_bc", "bc", "INTERNAL_vl_gc" ] + "nodes" : [ "INTERNAL_vl_dc1-bc", "bc", "INTERNAL_vl_gc" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -758,28 +758,28 @@ "node1" : "dc1", "node2" : "bbs1.2" }, { - "node1" : "BUSCO_ss1", + "node1" : "BUSCO_bbs1.1_ss1", "node2" : "bbs1.1" }, { "node1" : "bbs1.2", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs1.2_ss1" }, { "node1" : "ss1", - "node2" : "INTERNAL_vl_ss1" + "node2" : "INTERNAL_vl_BUSCO_bbs1.1_ss1-ss1" }, { - "node1" : "INTERNAL_vl_ss1", - "node2" : "BUSCO_ss1" + "node1" : "INTERNAL_vl_BUSCO_bbs1.1_ss1-ss1", + "node2" : "BUSCO_bbs1.1_ss1" }, { "node1" : "bc", - "node2" : "INTERNAL_vl_bc" + "node2" : "INTERNAL_vl_dc1-bc" }, { - "node1" : "INTERNAL_vl_bc", + "node1" : "INTERNAL_vl_dc1-bc", "node2" : "dc1" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl_ss1" + "node1" : "BUSCO_bbs1.2_ss1", + "node2" : "INTERNAL_vl_BUSCO_bbs1.2_ss1-ss1" }, { - "node1" : "INTERNAL_vl_ss1", + "node1" : "INTERNAL_vl_BUSCO_bbs1.2_ss1-ss1", "node2" : "ss1" }, { "node1" : "la", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5H.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5H.json index 4c6620096..8235e1202 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5H.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5H.json @@ -24,14 +24,14 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ba", + "id" : "INTERNAL_vl_da-ba", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 143.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bb", + "id" : "INTERNAL_vl_db-bb", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -212,7 +212,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "da", "INTERNAL_vl_ba" ] + "nodes" : [ "bbs", "da", "INTERNAL_vl_da-ba" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -233,7 +233,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl_ba", "ba", "INTERNAL_vl_la_fork" ] + "nodes" : [ "INTERNAL_vl_da-ba", "ba", "INTERNAL_vl_la_fork" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -348,7 +348,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "db", "INTERNAL_vl_bb" ] + "nodes" : [ "bbs", "db", "INTERNAL_vl_db-bb" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -369,7 +369,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl_bb", "bb", "INTERNAL_vl_lb_fork" ] + "nodes" : [ "INTERNAL_vl_db-bb", "bb", "INTERNAL_vl_lb_fork" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -423,15 +423,15 @@ "node2" : "bbs" }, { "node1" : "ba", - "node2" : "INTERNAL_vl_ba" + "node2" : "INTERNAL_vl_da-ba" }, { - "node1" : "INTERNAL_vl_ba", + "node1" : "INTERNAL_vl_da-ba", "node2" : "da" }, { "node1" : "bb", - "node2" : "INTERNAL_vl_bb" + "node2" : "INTERNAL_vl_db-bb" }, { - "node1" : "INTERNAL_vl_bb", + "node1" : "INTERNAL_vl_db-bb", "node2" : "db" }, { "node1" : "INTERNAL_vl_la_fork", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5V.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5V.json index 818df2728..d61d6dc53 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5V.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase5V.json @@ -32,7 +32,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ba", + "id" : "INTERNAL_vl_da-ba", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -205,7 +205,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "da", "INTERNAL_vl_ba" ] + "nodes" : [ "bbs", "da", "INTERNAL_vl_da-ba" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -226,7 +226,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl_ba", "ba", "INTERNAL_vl_la_fork" ] + "nodes" : [ "INTERNAL_vl_da-ba", "ba", "INTERNAL_vl_la_fork" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -401,9 +401,9 @@ "node2" : "bbs" }, { "node1" : "ba", - "node2" : "INTERNAL_vl_ba" + "node2" : "INTERNAL_vl_da-ba" }, { - "node1" : "INTERNAL_vl_ba", + "node1" : "INTERNAL_vl_da-ba", "node2" : "da" }, { "node1" : "INTERNAL_vl_la_fork", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6CouplingNonFlatHorizontal.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6CouplingNonFlatHorizontal.json index d1c5f904e..c381ee6bb 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6CouplingNonFlatHorizontal.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6CouplingNonFlatHorizontal.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ds1", + "id" : "BUSCO_bbs1.1_ds1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ds1", + "id" : "BUSCO_bbs1.2_ds1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ds2", + "id" : "BUSCO_bbs2.1_ds2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -32,7 +32,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ds2", + "id" : "BUSCO_bbs2.2_ds2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -40,21 +40,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", - "componentType" : "NODE", - "fictitious" : true, - "x" : 25.0, - "y" : 44.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", - "componentType" : "NODE", - "fictitious" : true, - "x" : 125.0, - "y" : 44.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds1", + "id" : "INTERNAL_vl_BUSCO_bbs1.1_ds1-ds1", "componentType" : "NODE", "fictitious" : true, "x" : 50.0, @@ -62,7 +48,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds1", + "id" : "INTERNAL_vl_BUSCO_bbs1.2_ds1-ds1", "componentType" : "NODE", "fictitious" : true, "x" : 100.0, @@ -70,7 +56,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds2", + "id" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "componentType" : "NODE", "fictitious" : true, "x" : 50.0, @@ -78,12 +64,26 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds2", + "id" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2", "componentType" : "NODE", "fictitious" : true, "x" : 100.0, "y" : 109.0, "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl_d1-b", + "componentType" : "NODE", + "fictitious" : true, + "x" : 25.0, + "y" : 44.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl_d2-b", + "componentType" : "NODE", + "fictitious" : true, + "x" : 125.0, + "y" : 44.0 }, { "type" : "SWITCH", "id" : "b", @@ -258,7 +258,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.2", "d2", "INTERNAL_vl_b" ] + "nodes" : [ "bbs2.2", "d2", "INTERNAL_vl_d2-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -279,7 +279,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_d1-b", "b", "INTERNAL_vl_d2-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -300,7 +300,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1.1", "d1", "INTERNAL_vl_d1-b" ] } ] } }, { @@ -347,7 +347,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.2", "BUSCO_ds1", "INTERNAL_vl_ds1" ] + "nodes" : [ "bbs1.2", "BUSCO_bbs1.2_ds1", "INTERNAL_vl_BUSCO_bbs1.2_ds1-ds1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -368,7 +368,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_ds1", "ds1", "INTERNAL_vl_ds1" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs1.1_ds1-ds1", "ds1", "INTERNAL_vl_BUSCO_bbs1.2_ds1-ds1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -389,7 +389,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.1", "BUSCO_ds1", "INTERNAL_vl_ds1" ] + "nodes" : [ "bbs1.1", "BUSCO_bbs1.1_ds1", "INTERNAL_vl_BUSCO_bbs1.1_ds1-ds1" ] } ] } }, { @@ -436,7 +436,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.2", "BUSCO_ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "bbs2.2", "BUSCO_bbs2.2_ds2", "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -457,7 +457,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_ds2", "ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "ds2", "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -478,7 +478,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.1", "BUSCO_ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "bbs2.1", "BUSCO_bbs2.1_ds2", "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2" ] } ] } } ], @@ -490,52 +490,52 @@ "node2" : "bbs2.2" }, { "node1" : "bbs1.1", - "node2" : "BUSCO_ds1" + "node2" : "BUSCO_bbs1.1_ds1" }, { - "node1" : "BUSCO_ds1", + "node1" : "BUSCO_bbs1.2_ds1", "node2" : "bbs1.2" }, { "node1" : "bbs2.1", - "node2" : "BUSCO_ds2" + "node2" : "BUSCO_bbs2.1_ds2" }, { - "node1" : "BUSCO_ds2", + "node1" : "BUSCO_bbs2.2_ds2", "node2" : "bbs2.2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { - "node1" : "BUSCO_ds1", - "node2" : "INTERNAL_vl_ds1" + "node1" : "BUSCO_bbs1.1_ds1", + "node2" : "INTERNAL_vl_BUSCO_bbs1.1_ds1-ds1" }, { - "node1" : "INTERNAL_vl_ds1", + "node1" : "INTERNAL_vl_BUSCO_bbs1.1_ds1-ds1", "node2" : "ds1" }, { "node1" : "ds1", - "node2" : "INTERNAL_vl_ds1" + "node2" : "INTERNAL_vl_BUSCO_bbs1.2_ds1-ds1" }, { - "node1" : "INTERNAL_vl_ds1", - "node2" : "BUSCO_ds1" + "node1" : "INTERNAL_vl_BUSCO_bbs1.2_ds1-ds1", + "node2" : "BUSCO_bbs1.2_ds1" }, { - "node1" : "BUSCO_ds2", - "node2" : "INTERNAL_vl_ds2" + "node1" : "BUSCO_bbs2.1_ds2", + "node2" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2" }, { - "node1" : "INTERNAL_vl_ds2", + "node1" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "node2" : "ds2" }, { "node1" : "b", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d2-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d2-b", "node2" : "d2" }, { "node1" : "ds2", - "node2" : "INTERNAL_vl_ds2" + "node2" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" }, { - "node1" : "INTERNAL_vl_ds2", - "node2" : "BUSCO_ds2" + "node1" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2", + "node2" : "BUSCO_bbs2.2_ds2" } ], "multitermNodes" : [ ], "twtEdges" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6InternalConnection.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6InternalConnection.json index 6746cc9a7..0e2648662 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6InternalConnection.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase6InternalConnection.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_1", + "id" : "BUSCO_bbs1.1_INTERNAL_vl_bbs1.1-bbs1.2_1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_2", + "id" : "BUSCO_bbs1.2_INTERNAL_vl_bbs1.1-bbs1.2_2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ds2", + "id" : "BUSCO_bbs2.1_ds2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -32,7 +32,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ds2", + "id" : "BUSCO_bbs2.2_ds2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -40,18 +40,20 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 44.0 + "x" : 50.0, + "y" : 109.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 44.0 + "x" : 100.0, + "y" : 109.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", "id" : "INTERNAL_vl_bbs1.1-bbs1.2_1", @@ -70,20 +72,18 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds2", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, - "x" : 50.0, - "y" : 109.0, - "orientation" : "RIGHT" + "x" : 25.0, + "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_ds2", + "id" : "INTERNAL_vl_d2-b", "componentType" : "NODE", "fictitious" : true, - "x" : 100.0, - "y" : 109.0, - "orientation" : "RIGHT" + "x" : 125.0, + "y" : 44.0 }, { "type" : "SWITCH", "id" : "b", @@ -246,7 +246,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.2", "d2", "INTERNAL_vl_b" ] + "nodes" : [ "bbs2.2", "d2", "INTERNAL_vl_d2-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -267,7 +267,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_b" ] + "nodes" : [ "INTERNAL_vl_d1-b", "b", "INTERNAL_vl_d2-b" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -288,7 +288,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.1", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs1.1", "d1", "INTERNAL_vl_d1-b" ] } ] } }, { @@ -335,7 +335,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.2", "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_2", "INTERNAL_vl_bbs1.1-bbs1.2_2" ] + "nodes" : [ "bbs1.2", "BUSCO_bbs1.2_INTERNAL_vl_bbs1.1-bbs1.2_2", "INTERNAL_vl_bbs1.1-bbs1.2_2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -377,7 +377,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1.1", "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_1", "INTERNAL_vl_bbs1.1-bbs1.2_1" ] + "nodes" : [ "bbs1.1", "BUSCO_bbs1.1_INTERNAL_vl_bbs1.1-bbs1.2_1", "INTERNAL_vl_bbs1.1-bbs1.2_1" ] } ] } }, { @@ -424,7 +424,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.2", "BUSCO_ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "bbs2.2", "BUSCO_bbs2.2_ds2", "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -445,7 +445,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_ds2", "ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "ds2", "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -466,7 +466,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2.1", "BUSCO_ds2", "INTERNAL_vl_ds2" ] + "nodes" : [ "bbs2.1", "BUSCO_bbs2.1_ds2", "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2" ] } ] } } ], @@ -481,46 +481,46 @@ "node2" : "INTERNAL_vl_bbs1.1-bbs1.2_2" }, { "node1" : "bbs1.1", - "node2" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_1" + "node2" : "BUSCO_bbs1.1_INTERNAL_vl_bbs1.1-bbs1.2_1" }, { - "node1" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_1", + "node1" : "BUSCO_bbs1.1_INTERNAL_vl_bbs1.1-bbs1.2_1", "node2" : "INTERNAL_vl_bbs1.1-bbs1.2_1" }, { "node1" : "bbs1.2", - "node2" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_2" + "node2" : "BUSCO_bbs1.2_INTERNAL_vl_bbs1.1-bbs1.2_2" }, { - "node1" : "BUSCO_INTERNAL_vl_bbs1.1-bbs1.2_2", + "node1" : "BUSCO_bbs1.2_INTERNAL_vl_bbs1.1-bbs1.2_2", "node2" : "INTERNAL_vl_bbs1.1-bbs1.2_2" }, { "node1" : "bbs2.1", - "node2" : "BUSCO_ds2" + "node2" : "BUSCO_bbs2.1_ds2" }, { - "node1" : "BUSCO_ds2", + "node1" : "BUSCO_bbs2.2_ds2", "node2" : "bbs2.2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { - "node1" : "BUSCO_ds2", - "node2" : "INTERNAL_vl_ds2" + "node1" : "BUSCO_bbs2.1_ds2", + "node2" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2" }, { - "node1" : "INTERNAL_vl_ds2", + "node1" : "INTERNAL_vl_BUSCO_bbs2.1_ds2-ds2", "node2" : "ds2" }, { "node1" : "b", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d2-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d2-b", "node2" : "d2" }, { "node1" : "ds2", - "node2" : "INTERNAL_vl_ds2" + "node2" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2" }, { - "node1" : "INTERNAL_vl_ds2", - "node2" : "BUSCO_ds2" + "node1" : "INTERNAL_vl_BUSCO_bbs2.2_ds2-ds2", + "node2" : "BUSCO_bbs2.2_ds2" } ], "multitermNodes" : [ ], "twtEdges" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg index 3112871b7..8e1a4fba0 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg @@ -94,10 +94,10 @@ - + - + @@ -126,7 +126,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg index fc89c8b98..0e348a82f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg @@ -143,10 +143,10 @@ - + - + @@ -162,10 +162,10 @@ — - + - + @@ -176,10 +176,10 @@ - + - + @@ -195,10 +195,10 @@ — - + - + @@ -209,10 +209,10 @@ - + - + @@ -228,10 +228,10 @@ — - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg index fc89c8b98..0e348a82f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg @@ -143,10 +143,10 @@ - + - + @@ -162,10 +162,10 @@ — - + - + @@ -176,10 +176,10 @@ - + - + @@ -195,10 +195,10 @@ — - + - + @@ -209,10 +209,10 @@ - + - + @@ -228,10 +228,10 @@ — - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg index 85e736df3..6962a4f2a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg @@ -148,40 +148,40 @@ bbs2 - + - + - + - + - + - + - + - + - + - + @@ -200,10 +200,10 @@ — - + - + @@ -221,10 +221,10 @@ - + - + @@ -243,10 +243,10 @@ — - + - + @@ -267,10 +267,10 @@ - + - + @@ -293,10 +293,10 @@ - + - + @@ -346,10 +346,10 @@ - + - + @@ -375,10 +375,10 @@ - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusApart.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusApart.json index 75ec485b2..657784039 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusApart.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusApart.json @@ -8,14 +8,14 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b1", + "id" : "INTERNAL_vl_d1-b1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_d2-b2", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -191,7 +191,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "d1", "INTERNAL_vl_b1" ] + "nodes" : [ "bbs1", "d1", "INTERNAL_vl_d1-b1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -212,7 +212,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_b1", "b1", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_d1-b1", "b1", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -281,7 +281,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d2", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs2", "d2", "INTERNAL_vl_d2-b2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -302,7 +302,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_b2", "b2", "INTERNAL_vl_g" ] + "nodes" : [ "INTERNAL_vl_d2-b2", "b2", "INTERNAL_vl_g" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -335,15 +335,15 @@ "node2" : "d2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b1" + "node2" : "INTERNAL_vl_d1-b1" }, { - "node1" : "INTERNAL_vl_b1", + "node1" : "INTERNAL_vl_d1-b1", "node2" : "b1" }, { "node1" : "d2", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_d2-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_d2-b2", "node2" : "b2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusParallel.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusParallel.json index 1870dc585..ce1961946 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusParallel.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseMissingBusbarPositionBusParallel.json @@ -15,7 +15,7 @@ "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_d2-b2", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -334,7 +334,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "d2", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs2", "d2", "INTERNAL_vl_d2-b2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -355,7 +355,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_b2", "b2", "INTERNAL_vl_g" ] + "nodes" : [ "INTERNAL_vl_d2-b2", "b2", "INTERNAL_vl_g" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -400,9 +400,9 @@ "node2" : "INTERNAL_vl_1" }, { "node1" : "d2", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_d2-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_d2-b2", "node2" : "b2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementNo.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementNo.json index 31775e4ae..5312cd85c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementNo.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementNo.json @@ -56,18 +56,18 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bA", + "id" : "INTERNAL_vl_commonFG", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 197.0 + "x" : 450.0, + "y" : 143.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_commonFG", + "id" : "INTERNAL_vl_dA-bA", "componentType" : "NODE", "fictitious" : true, - "x" : 450.0, - "y" : 143.0 + "x" : 25.0, + "y" : 197.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl_f", @@ -820,7 +820,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dA", "INTERNAL_vl_bA" ] + "nodes" : [ "bbs1", "dA", "INTERNAL_vl_dA-bA" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -841,7 +841,7 @@ "xSpan" : 50.0, "ySpan" : 90.0 }, - "nodes" : [ "INTERNAL_vl_bA", "bA", "INTERNAL_vl_fShuntA" ] + "nodes" : [ "INTERNAL_vl_dA-bA", "bA", "INTERNAL_vl_fShuntA" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2326,9 +2326,9 @@ "node2" : "INTERNAL_vl_commonFG" }, { "node1" : "bA", - "node2" : "INTERNAL_vl_bA" + "node2" : "INTERNAL_vl_dA-bA" }, { - "node1" : "INTERNAL_vl_bA", + "node1" : "INTERNAL_vl_dA-bA", "node2" : "dA" }, { "node1" : "loadA", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementYes.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementYes.json index a3b27023d..4c5eb2cd8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementYes.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseShuntArrangementYes.json @@ -56,18 +56,18 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bA", + "id" : "INTERNAL_vl_commonFG", "componentType" : "NODE", "fictitious" : true, - "x" : 75.0, - "y" : 197.0 + "x" : 550.0, + "y" : 143.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_commonFG", + "id" : "INTERNAL_vl_dA-bA", "componentType" : "NODE", "fictitious" : true, - "x" : 550.0, - "y" : 143.0 + "x" : 75.0, + "y" : 197.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl_f", @@ -820,7 +820,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dA", "INTERNAL_vl_bA" ] + "nodes" : [ "bbs1", "dA", "INTERNAL_vl_dA-bA" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -841,7 +841,7 @@ "xSpan" : 50.0, "ySpan" : 90.0 }, - "nodes" : [ "INTERNAL_vl_bA", "bA", "INTERNAL_vl_fShuntA" ] + "nodes" : [ "INTERNAL_vl_dA-bA", "bA", "INTERNAL_vl_fShuntA" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -2326,9 +2326,9 @@ "node2" : "INTERNAL_vl_commonFG" }, { "node1" : "bA", - "node2" : "INTERNAL_vl_bA" + "node2" : "INTERNAL_vl_dA-bA" }, { - "node1" : "INTERNAL_vl_bA", + "node1" : "INTERNAL_vl_dA-bA", "node2" : "dA" }, { "node1" : "loadA", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg index 167d9e367..54e85c855 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg @@ -70,10 +70,10 @@ bbs - + - + @@ -101,7 +101,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg index bcff67e0a..f95556293 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg @@ -66,10 +66,10 @@ bbs - + - + @@ -107,7 +107,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg index 2e8f75a1f..e4ec3f693 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg @@ -66,10 +66,10 @@ bbs - + - + @@ -87,10 +87,10 @@ tutu - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg index f1d7ea136..fd8a9d592 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg @@ -66,10 +66,10 @@ bbs - + - + @@ -91,7 +91,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg index e56204a3d..d7780bfb2 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg @@ -144,10 +144,10 @@ bbs - + - + @@ -170,7 +170,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestIncompleteFeederIssue.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestIncompleteFeederIssue.json index 389164a28..839493953 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestIncompleteFeederIssue.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestIncompleteFeederIssue.json @@ -15,7 +15,7 @@ "y" : 62.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d1-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -127,7 +127,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d1", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d1", "INTERNAL_vl_d1-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -148,7 +148,7 @@ "xSpan" : 50.0, "ySpan" : 81.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "d2", "INTERNAL_vl_INTERNAL_vl_fict2" ] + "nodes" : [ "INTERNAL_vl_d1-b", "b", "d2", "INTERNAL_vl_INTERNAL_vl_fict2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -181,9 +181,9 @@ "node2" : "d2" }, { "node1" : "d1", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d1-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d1-b", "node2" : "b" }, { "node1" : "d2", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellExplicitPosition.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellExplicitPosition.json index 333dedd79..1d0fa754d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellExplicitPosition.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellExplicitPosition.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bc1", + "id" : "INTERNAL_vl_dc11-bc1", "componentType" : "NODE", "fictitious" : true, "x" : 125.0, @@ -16,7 +16,7 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bc1", + "id" : "INTERNAL_vl_dc12-bc1", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -24,28 +24,28 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bc2", + "id" : "INTERNAL_vl_dc21-bc2", "componentType" : "NODE", "fictitious" : true, "x" : 275.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bc2", + "id" : "INTERNAL_vl_dc22-bc2", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, "y" : 132.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bl1", + "id" : "INTERNAL_vl_dl1-bl1", "componentType" : "NODE", "fictitious" : true, "x" : 175.0, "y" : 142.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_bl2", + "id" : "INTERNAL_vl_dl2-bl2", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -288,7 +288,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dc12", "INTERNAL_vl_bc1" ] + "nodes" : [ "bbs2", "dc12", "INTERNAL_vl_dc12-bc1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -309,7 +309,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_bc1", "bc1", "INTERNAL_vl_bc1" ] + "nodes" : [ "INTERNAL_vl_dc12-bc1", "bc1", "INTERNAL_vl_dc11-bc1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -330,7 +330,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dc11", "INTERNAL_vl_bc1" ] + "nodes" : [ "bbs1", "dc11", "INTERNAL_vl_dc11-bc1" ] } ] } }, { @@ -377,7 +377,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dc22", "INTERNAL_vl_bc2" ] + "nodes" : [ "bbs2", "dc22", "INTERNAL_vl_dc22-bc2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -398,7 +398,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_bc2", "bc2", "INTERNAL_vl_bc2" ] + "nodes" : [ "INTERNAL_vl_dc22-bc2", "bc2", "INTERNAL_vl_dc21-bc2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -419,7 +419,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dc21", "INTERNAL_vl_bc2" ] + "nodes" : [ "bbs1", "dc21", "INTERNAL_vl_dc21-bc2" ] } ] } }, { @@ -467,7 +467,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs1", "dl1", "INTERNAL_vl_bl1" ] + "nodes" : [ "bbs1", "dl1", "INTERNAL_vl_dl1-bl1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -488,7 +488,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_bl1", "bl1", "INTERNAL_vl_l1" ] + "nodes" : [ "INTERNAL_vl_dl1-bl1", "bl1", "INTERNAL_vl_l1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -557,7 +557,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs2", "dl2", "INTERNAL_vl_bl2" ] + "nodes" : [ "bbs2", "dl2", "INTERNAL_vl_dl2-bl2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -578,7 +578,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_bl2", "bl2", "INTERNAL_vl_l2" ] + "nodes" : [ "INTERNAL_vl_dl2-bl2", "bl2", "INTERNAL_vl_l2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -623,39 +623,39 @@ "node2" : "dc22" }, { "node1" : "dl1", - "node2" : "INTERNAL_vl_bl1" + "node2" : "INTERNAL_vl_dl1-bl1" }, { - "node1" : "INTERNAL_vl_bl1", + "node1" : "INTERNAL_vl_dl1-bl1", "node2" : "bl1" }, { "node1" : "bc1", - "node2" : "INTERNAL_vl_bc1" + "node2" : "INTERNAL_vl_dc11-bc1" }, { - "node1" : "INTERNAL_vl_bc1", + "node1" : "INTERNAL_vl_dc11-bc1", "node2" : "dc11" }, { "node1" : "bc2", - "node2" : "INTERNAL_vl_bc2" + "node2" : "INTERNAL_vl_dc21-bc2" }, { - "node1" : "INTERNAL_vl_bc2", + "node1" : "INTERNAL_vl_dc21-bc2", "node2" : "dc21" }, { "node1" : "dl2", - "node2" : "INTERNAL_vl_bl2" + "node2" : "INTERNAL_vl_dl2-bl2" }, { - "node1" : "INTERNAL_vl_bl2", + "node1" : "INTERNAL_vl_dl2-bl2", "node2" : "bl2" }, { "node1" : "bc1", - "node2" : "INTERNAL_vl_bc1" + "node2" : "INTERNAL_vl_dc12-bc1" }, { - "node1" : "INTERNAL_vl_bc1", + "node1" : "INTERNAL_vl_dc12-bc1", "node2" : "dc12" }, { "node1" : "bc2", - "node2" : "INTERNAL_vl_bc2" + "node2" : "INTERNAL_vl_dc22-bc2" }, { - "node1" : "INTERNAL_vl_bc2", + "node1" : "INTERNAL_vl_dc22-bc2", "node2" : "dc22" }, { "node1" : "bl1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellShapes.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellShapes.json index 2b681b154..43ae950fe 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellShapes.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestInternCellShapes.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_flatDisconector", + "id" : "BUSCO_bbs11_flatDisconector", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 150.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_flatDisconector", + "id" : "BUSCO_bbs12_flatDisconector", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 200.0, @@ -24,67 +24,67 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_crossOverBreaker", + "id" : "INTERNAL_vl_BUSCO_bbs11_flatDisconector-flatDisconector", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 44.0 + "x" : 150.0, + "y" : 84.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_crossOverBreaker", + "id" : "INTERNAL_vl_BUSCO_bbs12_flatDisconector-flatDisconector", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, - "y" : 44.0 + "x" : 200.0, + "y" : 84.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_dF2", + "id" : "INTERNAL_vl_dCrossOverBk1-crossOverBreaker", "componentType" : "NODE", "fictitious" : true, - "x" : 275.0, + "x" : 125.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_flatBreaker", + "id" : "INTERNAL_vl_dCrossOverBk2-crossOverBreaker", "componentType" : "NODE", "fictitious" : true, - "x" : 150.0, - "y" : 109.0, - "orientation" : "RIGHT" + "x" : 225.0, + "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_flatBreaker", + "id" : "INTERNAL_vl_dF1-dF2", "componentType" : "NODE", "fictitious" : true, - "x" : 200.0, - "y" : 109.0, - "orientation" : "RIGHT" + "x" : 275.0, + "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_flatDisconector", + "id" : "INTERNAL_vl_dFlatBk1-flatBreaker", "componentType" : "NODE", "fictitious" : true, "x" : 150.0, - "y" : 84.0, + "y" : 109.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_flatDisconector", + "id" : "INTERNAL_vl_dFlatBk2-flatBreaker", "componentType" : "NODE", "fictitious" : true, "x" : 200.0, - "y" : 84.0, + "y" : 109.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_verticalBreaker", + "id" : "INTERNAL_vl_dVerticalBk1-verticalBreaker", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_verticalBreaker", + "id" : "INTERNAL_vl_dVerticalBk2-verticalBreaker", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -343,7 +343,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "dVerticalBk2", "INTERNAL_vl_verticalBreaker" ] + "nodes" : [ "bbs21", "dVerticalBk2", "INTERNAL_vl_dVerticalBk2-verticalBreaker" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -364,7 +364,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_verticalBreaker", "verticalBreaker", "INTERNAL_vl_verticalBreaker" ] + "nodes" : [ "INTERNAL_vl_dVerticalBk2-verticalBreaker", "verticalBreaker", "INTERNAL_vl_dVerticalBk1-verticalBreaker" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -385,7 +385,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "dVerticalBk1", "INTERNAL_vl_verticalBreaker" ] + "nodes" : [ "bbs11", "dVerticalBk1", "INTERNAL_vl_dVerticalBk1-verticalBreaker" ] } ] } }, { @@ -431,7 +431,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "dCrossOverBk2", "INTERNAL_vl_crossOverBreaker" ] + "nodes" : [ "bbs22", "dCrossOverBk2", "INTERNAL_vl_dCrossOverBk2-crossOverBreaker" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -452,7 +452,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_crossOverBreaker", "crossOverBreaker", "INTERNAL_vl_crossOverBreaker" ] + "nodes" : [ "INTERNAL_vl_dCrossOverBk1-crossOverBreaker", "crossOverBreaker", "INTERNAL_vl_dCrossOverBk2-crossOverBreaker" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -473,7 +473,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "dCrossOverBk1", "INTERNAL_vl_crossOverBreaker" ] + "nodes" : [ "bbs11", "dCrossOverBk1", "INTERNAL_vl_dCrossOverBk1-crossOverBreaker" ] } ] } }, { @@ -520,7 +520,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_flatDisconector", "INTERNAL_vl_flatDisconector" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_flatDisconector", "INTERNAL_vl_BUSCO_bbs12_flatDisconector-flatDisconector" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -541,7 +541,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_flatDisconector", "flatDisconector", "INTERNAL_vl_flatDisconector" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs11_flatDisconector-flatDisconector", "flatDisconector", "INTERNAL_vl_BUSCO_bbs12_flatDisconector-flatDisconector" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -562,7 +562,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_flatDisconector", "INTERNAL_vl_flatDisconector" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_flatDisconector", "INTERNAL_vl_BUSCO_bbs11_flatDisconector-flatDisconector" ] } ] } }, { @@ -609,7 +609,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "dFlatBk2", "INTERNAL_vl_flatBreaker" ] + "nodes" : [ "bbs22", "dFlatBk2", "INTERNAL_vl_dFlatBk2-flatBreaker" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -630,7 +630,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_flatBreaker", "flatBreaker", "INTERNAL_vl_flatBreaker" ] + "nodes" : [ "INTERNAL_vl_dFlatBk1-flatBreaker", "flatBreaker", "INTERNAL_vl_dFlatBk2-flatBreaker" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -651,7 +651,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "dFlatBk1", "INTERNAL_vl_flatBreaker" ] + "nodes" : [ "bbs21", "dFlatBk1", "INTERNAL_vl_dFlatBk1-flatBreaker" ] } ] } }, { @@ -698,7 +698,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "dF1", "INTERNAL_vl_dF2" ] + "nodes" : [ "bbs12", "dF1", "INTERNAL_vl_dF1-dF2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -719,7 +719,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "dF2", "INTERNAL_vl_dF2" ] + "nodes" : [ "bbs22", "dF2", "INTERNAL_vl_dF1-dF2" ] } ] } } ], @@ -749,63 +749,63 @@ "node2" : "dF2" }, { "node1" : "bbs11", - "node2" : "BUSCO_flatDisconector" + "node2" : "BUSCO_bbs11_flatDisconector" }, { - "node1" : "BUSCO_flatDisconector", + "node1" : "BUSCO_bbs12_flatDisconector", "node2" : "bbs12" }, { "node1" : "dVerticalBk1", - "node2" : "INTERNAL_vl_verticalBreaker" + "node2" : "INTERNAL_vl_dVerticalBk1-verticalBreaker" }, { - "node1" : "INTERNAL_vl_verticalBreaker", + "node1" : "INTERNAL_vl_dVerticalBk1-verticalBreaker", "node2" : "verticalBreaker" }, { "node1" : "dCrossOverBk1", - "node2" : "INTERNAL_vl_crossOverBreaker" + "node2" : "INTERNAL_vl_dCrossOverBk1-crossOverBreaker" }, { - "node1" : "INTERNAL_vl_crossOverBreaker", + "node1" : "INTERNAL_vl_dCrossOverBk1-crossOverBreaker", "node2" : "crossOverBreaker" }, { - "node1" : "BUSCO_flatDisconector", - "node2" : "INTERNAL_vl_flatDisconector" + "node1" : "BUSCO_bbs11_flatDisconector", + "node2" : "INTERNAL_vl_BUSCO_bbs11_flatDisconector-flatDisconector" }, { - "node1" : "INTERNAL_vl_flatDisconector", + "node1" : "INTERNAL_vl_BUSCO_bbs11_flatDisconector-flatDisconector", "node2" : "flatDisconector" }, { "node1" : "dFlatBk1", - "node2" : "INTERNAL_vl_flatBreaker" + "node2" : "INTERNAL_vl_dFlatBk1-flatBreaker" }, { - "node1" : "INTERNAL_vl_flatBreaker", + "node1" : "INTERNAL_vl_dFlatBk1-flatBreaker", "node2" : "flatBreaker" }, { "node1" : "dVerticalBk2", - "node2" : "INTERNAL_vl_verticalBreaker" + "node2" : "INTERNAL_vl_dVerticalBk2-verticalBreaker" }, { - "node1" : "INTERNAL_vl_verticalBreaker", + "node1" : "INTERNAL_vl_dVerticalBk2-verticalBreaker", "node2" : "verticalBreaker" }, { "node1" : "dF1", - "node2" : "INTERNAL_vl_dF2" + "node2" : "INTERNAL_vl_dF1-dF2" }, { - "node1" : "INTERNAL_vl_dF2", + "node1" : "INTERNAL_vl_dF1-dF2", "node2" : "dF2" }, { "node1" : "flatDisconector", - "node2" : "INTERNAL_vl_flatDisconector" + "node2" : "INTERNAL_vl_BUSCO_bbs12_flatDisconector-flatDisconector" }, { - "node1" : "INTERNAL_vl_flatDisconector", - "node2" : "BUSCO_flatDisconector" + "node1" : "INTERNAL_vl_BUSCO_bbs12_flatDisconector-flatDisconector", + "node2" : "BUSCO_bbs12_flatDisconector" }, { "node1" : "dFlatBk2", - "node2" : "INTERNAL_vl_flatBreaker" + "node2" : "INTERNAL_vl_dFlatBk2-flatBreaker" }, { - "node1" : "INTERNAL_vl_flatBreaker", + "node1" : "INTERNAL_vl_dFlatBk2-flatBreaker", "node2" : "flatBreaker" }, { "node1" : "dCrossOverBk2", - "node2" : "INTERNAL_vl_crossOverBreaker" + "node2" : "INTERNAL_vl_dCrossOverBk2-crossOverBreaker" }, { - "node1" : "INTERNAL_vl_crossOverBreaker", + "node1" : "INTERNAL_vl_dCrossOverBk2-crossOverBreaker", "node2" : "crossOverBreaker" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg index 3e7fa3451..f41f0e908 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg @@ -147,10 +147,10 @@ bbs1 - + - + @@ -173,7 +173,7 @@ - + @@ -191,10 +191,10 @@ - + - + @@ -217,7 +217,7 @@ - + @@ -239,10 +239,10 @@ bbs2 - + - + @@ -265,7 +265,7 @@ - + @@ -283,10 +283,10 @@ - + - + @@ -309,7 +309,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json index 8489dee94..80b20b039 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json @@ -177,15 +177,15 @@ "positionName" : "S_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_b1", + "id" : "idINTERNAL_95_vl1_95_d2_45_b2", "vid" : "vl1", "componentType" : "NODE", "open" : false, "vlabel" : false, "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_b2", - "vid" : "vl1", + "id" : "idINTERNAL_95_vl2_95_d4_45_b4", + "vid" : "vl2", "componentType" : "NODE", "open" : false, "vlabel" : false, @@ -269,6 +269,13 @@ "vlabel" : false, "equipmentId" : "b3", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_d1_45_b1", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbbs1", "vid" : "vl1", @@ -303,6 +310,13 @@ "open" : false, "vlabel" : true, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_d3_45_b3", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idg", "vid" : "vl2", @@ -340,20 +354,6 @@ "id" : "l_N_LABEL", "positionName" : "N_LABEL" } ] - }, { - "id" : "idINTERNAL_95_vl2_95_b4", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_b3", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idINTERNAL_95_vl2_95_trf_95_TWO", "vid" : "vl2", @@ -380,18 +380,18 @@ "nodeId2" : "idd1", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl2_95_d3_95_INTERNAL_95_vl2_95_b3", - "nodeId1" : "idd3", - "nodeId2" : "idINTERNAL_95_vl2_95_b3", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl2_95_bbs2_95_d4", "nodeId1" : "idbbs2", "nodeId2" : "idd4", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_d1_45_b1_95_b1", + "nodeId1" : "idINTERNAL_95_vl1_95_d1_45_b1", + "nodeId2" : "idb1", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_bbs2_95_d3", "nodeId1" : "idbbs2", @@ -410,6 +410,12 @@ "nodeId2" : "idtrf_95_TWO", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl2_95_d4_95_INTERNAL_95_vl2_95_d4_45_b4", + "nodeId1" : "idd4", + "nodeId2" : "idINTERNAL_95_vl2_95_d4_45_b4", + "straight" : false, + "snakeLine" : false }, { "id" : "idEDGE_95_trf_95_ONE", "nodeId1" : "idtrf_95_ONE", @@ -422,12 +428,30 @@ "nodeId2" : "idtrf_95_ONE", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_d1_95_INTERNAL_95_vl1_95_d1_45_b1", + "nodeId1" : "idd1", + "nodeId2" : "idINTERNAL_95_vl1_95_d1_45_b1", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl2_95_d3_95_INTERNAL_95_vl2_95_d3_45_b3", + "nodeId1" : "idd3", + "nodeId2" : "idINTERNAL_95_vl2_95_d3_45_b3", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_INTERNAL_95_vl1_95_l_95_l", "nodeId1" : "idINTERNAL_95_vl1_95_l", "nodeId2" : "idl", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_d2_45_b2_95_b2", + "nodeId1" : "idINTERNAL_95_vl1_95_d2_45_b2", + "nodeId2" : "idb2", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_b3_95_INTERNAL_95_vl2_95_g", "nodeId1" : "idb3", @@ -435,9 +459,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_d2_95_INTERNAL_95_vl1_95_b2", - "nodeId1" : "idd2", - "nodeId2" : "idINTERNAL_95_vl1_95_b2", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_d4_45_b4_95_b4", + "nodeId1" : "idINTERNAL_95_vl2_95_d4_45_b4", + "nodeId2" : "idb4", "straight" : false, "snakeLine" : false }, { @@ -447,9 +471,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_b4_95_b4", - "nodeId1" : "idINTERNAL_95_vl2_95_b4", - "nodeId2" : "idb4", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_d3_45_b3_95_b3", + "nodeId1" : "idINTERNAL_95_vl2_95_d3_45_b3", + "nodeId2" : "idb3", "straight" : false, "snakeLine" : false }, { @@ -459,39 +483,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_b4_95_INTERNAL_95_vl2_95_trf_95_TWO", - "nodeId1" : "idb4", - "nodeId2" : "idINTERNAL_95_vl2_95_trf_95_TWO", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_b2_95_b2", - "nodeId1" : "idINTERNAL_95_vl1_95_b2", - "nodeId2" : "idb2", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_d1_95_INTERNAL_95_vl1_95_b1", - "nodeId1" : "idd1", - "nodeId2" : "idINTERNAL_95_vl1_95_b1", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_b1_95_b1", - "nodeId1" : "idINTERNAL_95_vl1_95_b1", - "nodeId2" : "idb1", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl2_95_d4_95_INTERNAL_95_vl2_95_b4", - "nodeId1" : "idd4", - "nodeId2" : "idINTERNAL_95_vl2_95_b4", + "id" : "_95_vl1_95_d2_95_INTERNAL_95_vl1_95_d2_45_b2", + "nodeId1" : "idd2", + "nodeId2" : "idINTERNAL_95_vl1_95_d2_45_b2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_b3_95_b3", - "nodeId1" : "idINTERNAL_95_vl2_95_b3", - "nodeId2" : "idb3", + "id" : "_95_vl2_95_b4_95_INTERNAL_95_vl2_95_trf_95_TWO", + "nodeId1" : "idb4", + "nodeId2" : "idINTERNAL_95_vl2_95_trf_95_TWO", "straight" : false, "snakeLine" : false } ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg index b2ba95605..5c6f1d03b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg @@ -144,10 +144,10 @@ bbs1 - + - + @@ -170,7 +170,7 @@ - + @@ -188,10 +188,10 @@ - + - + @@ -214,7 +214,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json index 2f55eda06..a31931ea4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json @@ -115,6 +115,13 @@ "styleClass" : "sld-breaker" } ], "nodes" : [ { + "id" : "idINTERNAL_95_vl1_95_d1_45_b1", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { "id" : "idl", "vid" : "vl1", "componentType" : "LOAD", @@ -126,13 +133,6 @@ "id" : "l_N_LABEL", "positionName" : "N_LABEL" } ] - }, { - "id" : "idINTERNAL_95_vl1_95_b1", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_l", "vid" : "vl1", @@ -140,13 +140,6 @@ "open" : false, "vlabel" : false, "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_b2", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_trf_95_ONE", "vid" : "vl1", @@ -178,6 +171,13 @@ "id" : "bbs1_NW_LABEL", "positionName" : "NW_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_d2_45_b2", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idd2", "vid" : "vl1", @@ -224,9 +224,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_d2_95_INTERNAL_95_vl1_95_b2", - "nodeId1" : "idd2", - "nodeId2" : "idINTERNAL_95_vl1_95_b2", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_d1_45_b1_95_b1", + "nodeId1" : "idINTERNAL_95_vl1_95_d1_45_b1", + "nodeId2" : "idb1", "straight" : false, "snakeLine" : false }, { @@ -242,15 +242,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_b2_95_b2", - "nodeId1" : "idINTERNAL_95_vl1_95_b2", - "nodeId2" : "idb2", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_d1_95_INTERNAL_95_vl1_95_b1", - "nodeId1" : "idd1", - "nodeId2" : "idINTERNAL_95_vl1_95_b1", + "id" : "_95_vl1_95_d2_95_INTERNAL_95_vl1_95_d2_45_b2", + "nodeId1" : "idd2", + "nodeId2" : "idINTERNAL_95_vl1_95_d2_45_b2", "straight" : false, "snakeLine" : false }, { @@ -260,9 +254,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_b1_95_b1", - "nodeId1" : "idINTERNAL_95_vl1_95_b1", - "nodeId2" : "idb1", + "id" : "_95_vl1_95_d1_95_INTERNAL_95_vl1_95_d1_45_b1", + "nodeId1" : "idd1", + "nodeId2" : "idINTERNAL_95_vl1_95_d1_45_b1", "straight" : false, "snakeLine" : false }, { @@ -271,6 +265,12 @@ "nodeId2" : "idl", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_d2_45_b2_95_b2", + "nodeId1" : "idINTERNAL_95_vl1_95_d2_45_b2", + "nodeId2" : "idb2", + "straight" : false, + "snakeLine" : false } ], "lines" : [ ], "feederInfos" : [ { diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork1.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork1.json index f18c1c821..0e6ddb7b3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork1.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork1.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -119,7 +119,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d", "INTERNAL_vl_d-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -140,7 +140,7 @@ "xSpan" : 50.0, "ySpan" : 188.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_d-b", "b", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -170,9 +170,9 @@ "node2" : "d" }, { "node1" : "d", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d-b", "node2" : "b" }, { "node1" : "b", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork2.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork2.json index f18c1c821..0e6ddb7b3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork2.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnicityNodeIdNetWork2.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d-b", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, @@ -119,7 +119,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d", "INTERNAL_vl_d-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -140,7 +140,7 @@ "xSpan" : 50.0, "ySpan" : 188.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_l" ] + "nodes" : [ "INTERNAL_vl_d-b", "b", "INTERNAL_vl_l" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -170,9 +170,9 @@ "node2" : "d" }, { "node1" : "d", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d-b", "node2" : "b" }, { "node1" : "b", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg index 56f3897b5..8a893d517 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg @@ -173,10 +173,10 @@ - + - + @@ -194,10 +194,10 @@ - + - + @@ -209,10 +209,10 @@ BL - + - + @@ -247,10 +247,10 @@ EJ - + - + @@ -368,10 +368,10 @@ - + - + @@ -417,10 +417,10 @@ CX - + - + @@ -539,10 +539,10 @@ - + - + @@ -598,10 +598,10 @@ EX - + - + @@ -684,10 +684,10 @@ - + - + @@ -741,10 +741,10 @@ - + - + @@ -768,10 +768,10 @@ BZ - + - + @@ -852,10 +852,10 @@ CV - + - + @@ -882,10 +882,10 @@ - + - + @@ -897,10 +897,10 @@ - + - + @@ -922,10 +922,10 @@ - + - + @@ -944,10 +944,10 @@ 0 - + - + @@ -966,10 +966,10 @@ - + - + @@ -985,10 +985,10 @@ 0 - + - + @@ -1001,10 +1001,10 @@ - + - + @@ -1023,10 +1023,10 @@ — - + - + @@ -1044,10 +1044,10 @@ - + - + @@ -1059,10 +1059,10 @@ - + - + @@ -1084,10 +1084,10 @@ - + - + @@ -1103,10 +1103,10 @@ — - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg index c7314d516..54df7b274 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg @@ -148,43 +148,43 @@ bbs2 - + - + - + - + - + - + - + - + - + - + - + @@ -220,7 +220,7 @@ - + @@ -244,10 +244,10 @@ - + - + @@ -266,10 +266,10 @@ — - + - + @@ -288,10 +288,10 @@ - + - + @@ -310,10 +310,10 @@ 50 - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg index 97202c99a..05037b280 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg @@ -148,40 +148,40 @@ bbs2 - + - + - + - + - + - + - + - + - + - + @@ -222,10 +222,10 @@ 50 - + - + @@ -256,10 +256,10 @@ - + - + @@ -278,10 +278,10 @@ — - + - + @@ -300,10 +300,10 @@ - + - + @@ -322,10 +322,10 @@ 100 - + - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg index cc52e5d7e..9388c6675 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg @@ -83,10 +83,10 @@ bbs1 - + - + @@ -99,7 +99,7 @@ - + @@ -117,10 +117,10 @@ - + - + @@ -133,7 +133,7 @@ - + @@ -148,10 +148,10 @@ - + - + @@ -164,7 +164,7 @@ - + @@ -186,10 +186,10 @@ bbs2 - + - + @@ -202,7 +202,7 @@ - + @@ -217,10 +217,10 @@ - + - + @@ -233,7 +233,7 @@ - + @@ -255,10 +255,10 @@ bbs3 - + - + @@ -271,7 +271,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg index 96366a917..75d60c7b8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg @@ -80,10 +80,10 @@ bbs2 - + - + @@ -96,7 +96,7 @@ - + @@ -113,10 +113,10 @@ - + - + @@ -132,7 +132,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg index 71eb2cc77..29ffaafcc 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg @@ -80,10 +80,10 @@ bbs3 - + - + @@ -99,7 +99,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust1.json b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust1.json index 673d91b18..6d0f7c8b9 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust1.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust1.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs11_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 150.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs12_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 200.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs21_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -32,12 +32,44 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs22_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, "y" : 197.0, "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 150.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 200.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 50.0, + "y" : 197.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 100.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_f", @@ -82,38 +114,6 @@ "fictitious" : true, "x" : 225.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 150.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 200.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 50.0, - "y" : 197.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 100.0, - "y" : 197.0, - "orientation" : "RIGHT" }, { "type" : "SWITCH", "id" : "b", @@ -396,7 +396,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_ss1", "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -417,7 +417,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_ss1", "ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", "ss1", "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -438,7 +438,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_ss1", "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1" ] } ] } }, { @@ -484,7 +484,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "BUSCO_ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "bbs22", "BUSCO_bbs22_ss2", "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -505,7 +505,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_ss2", "ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", "ss2", "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -526,7 +526,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "BUSCO_ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "bbs21", "BUSCO_bbs21_ss2", "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2" ] } ] } }, { @@ -973,39 +973,39 @@ "node2" : "b2" }, { "node1" : "bbs11", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs11_ss1" }, { "node1" : "bbs12", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs12_ss1" }, { "node1" : "bbs21", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs21_ss2" }, { "node1" : "bbs22", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs22_ss2" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl1_ss1" + "node1" : "BUSCO_bbs11_ss1", + "node2" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1" }, { - "node1" : "INTERNAL_vl1_ss1", + "node1" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl1_ss1" + "node1" : "BUSCO_bbs12_ss1", + "node2" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" }, { - "node1" : "INTERNAL_vl1_ss1", + "node1" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl1_ss2" + "node1" : "BUSCO_bbs21_ss2", + "node2" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2" }, { - "node1" : "INTERNAL_vl1_ss2", + "node1" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", "node2" : "ss2" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl1_ss2" + "node1" : "BUSCO_bbs22_ss2", + "node2" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" }, { - "node1" : "INTERNAL_vl1_ss2", + "node1" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2", "node2" : "ss2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust2.json b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust2.json index c4ada1bf7..00548a46c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust2.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyClust2.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs11_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs12_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs21_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 150.0, @@ -32,12 +32,44 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs22_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 200.0, "y" : 197.0, "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 50.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 100.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 150.0, + "y" : 197.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 200.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_f", @@ -82,38 +114,6 @@ "fictitious" : true, "x" : 225.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 50.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 100.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 150.0, - "y" : 197.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 200.0, - "y" : 197.0, - "orientation" : "RIGHT" }, { "type" : "SWITCH", "id" : "b", @@ -396,7 +396,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_ss1", "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -417,7 +417,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ss1", "ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", "ss1", "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -438,7 +438,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_ss1", "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1" ] } ] } }, { @@ -484,7 +484,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "BUSCO_ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "bbs22", "BUSCO_bbs22_ss2", "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -505,7 +505,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ss2", "ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", "ss2", "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -526,7 +526,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "BUSCO_ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "bbs21", "BUSCO_bbs21_ss2", "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2" ] } ] } }, { @@ -973,39 +973,39 @@ "node2" : "b2" }, { "node1" : "bbs11", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs11_ss1" }, { "node1" : "bbs12", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs12_ss1" }, { "node1" : "bbs21", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs21_ss2" }, { "node1" : "bbs22", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs22_ss2" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl2_ss1" + "node1" : "BUSCO_bbs11_ss1", + "node2" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1" }, { - "node1" : "INTERNAL_vl2_ss1", + "node1" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl2_ss1" + "node1" : "BUSCO_bbs12_ss1", + "node2" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" }, { - "node1" : "INTERNAL_vl2_ss1", + "node1" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl2_ss2" + "node1" : "BUSCO_bbs21_ss2", + "node2" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2" }, { - "node1" : "INTERNAL_vl2_ss2", + "node1" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", "node2" : "ss2" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl2_ss2" + "node1" : "BUSCO_bbs22_ss2", + "node2" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" }, { - "node1" : "INTERNAL_vl2_ss2", + "node1" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2", "node2" : "ss2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt1.json b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt1.json index cd4a78591..f25f98110 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt1.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt1.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs11_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 150.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs12_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 200.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs21_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -32,12 +32,44 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs22_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, "y" : 197.0, "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 150.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 200.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 50.0, + "y" : 197.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 100.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_f", @@ -80,38 +112,6 @@ "fictitious" : true, "x" : 225.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 150.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 200.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 50.0, - "y" : 197.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl1_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 100.0, - "y" : 197.0, - "orientation" : "RIGHT" }, { "type" : "SWITCH", "id" : "b", @@ -391,7 +391,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_ss1", "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -412,7 +412,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_ss1", "ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", "ss1", "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -433,7 +433,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_ss1", "INTERNAL_vl1_ss1" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_ss1", "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1" ] } ] } }, { @@ -480,7 +480,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "BUSCO_ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "bbs22", "BUSCO_bbs22_ss2", "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -501,7 +501,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_ss2", "ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", "ss2", "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -522,7 +522,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "BUSCO_ss2", "INTERNAL_vl1_ss2" ] + "nodes" : [ "bbs21", "BUSCO_bbs21_ss2", "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2" ] } ] } }, { @@ -969,39 +969,39 @@ "node2" : "b2" }, { "node1" : "bbs11", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs11_ss1" }, { "node1" : "bbs12", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs12_ss1" }, { "node1" : "bbs21", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs21_ss2" }, { "node1" : "bbs22", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs22_ss2" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl1_ss1" + "node1" : "BUSCO_bbs11_ss1", + "node2" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1" }, { - "node1" : "INTERNAL_vl1_ss1", + "node1" : "INTERNAL_vl1_BUSCO_bbs11_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl1_ss1" + "node1" : "BUSCO_bbs12_ss1", + "node2" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1" }, { - "node1" : "INTERNAL_vl1_ss1", + "node1" : "INTERNAL_vl1_BUSCO_bbs12_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl1_ss2" + "node1" : "BUSCO_bbs21_ss2", + "node2" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2" }, { - "node1" : "INTERNAL_vl1_ss2", + "node1" : "INTERNAL_vl1_BUSCO_bbs21_ss2-ss2", "node2" : "ss2" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl1_ss2" + "node1" : "BUSCO_bbs22_ss2", + "node2" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2" }, { - "node1" : "INTERNAL_vl1_ss2", + "node1" : "INTERNAL_vl1_BUSCO_bbs22_ss2-ss2", "node2" : "ss2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt2.json b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt2.json index 83bdf4310..ff68429d6 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt2.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/orderConsistencyExt2.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs11_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss1", + "id" : "BUSCO_bbs12_ss1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs21_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 150.0, @@ -32,12 +32,44 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_ss2", + "id" : "BUSCO_bbs22_ss2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 200.0, "y" : 197.0, "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 50.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 100.0, + "y" : 172.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 150.0, + "y" : 197.0, + "orientation" : "RIGHT" + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2", + "componentType" : "NODE", + "fictitious" : true, + "x" : 200.0, + "y" : 197.0, + "orientation" : "RIGHT" }, { "type" : "INTERNAL", "id" : "INTERNAL_vl2_f", @@ -80,38 +112,6 @@ "fictitious" : true, "x" : 225.0, "y" : 62.0 - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 50.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss1", - "componentType" : "NODE", - "fictitious" : true, - "x" : 100.0, - "y" : 172.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 150.0, - "y" : 197.0, - "orientation" : "RIGHT" - }, { - "type" : "INTERNAL", - "id" : "INTERNAL_vl2_ss2", - "componentType" : "NODE", - "fictitious" : true, - "x" : 200.0, - "y" : 197.0, - "orientation" : "RIGHT" }, { "type" : "SWITCH", "id" : "b", @@ -391,7 +391,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_ss1", "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -412,7 +412,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ss1", "ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", "ss1", "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -433,7 +433,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_ss1", "INTERNAL_vl2_ss1" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_ss1", "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1" ] } ] } }, { @@ -480,7 +480,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "BUSCO_ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "bbs22", "BUSCO_bbs22_ss2", "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -501,7 +501,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl2_ss2", "ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", "ss2", "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -522,7 +522,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "BUSCO_ss2", "INTERNAL_vl2_ss2" ] + "nodes" : [ "bbs21", "BUSCO_bbs21_ss2", "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2" ] } ] } }, { @@ -969,39 +969,39 @@ "node2" : "b2" }, { "node1" : "bbs11", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs11_ss1" }, { "node1" : "bbs12", - "node2" : "BUSCO_ss1" + "node2" : "BUSCO_bbs12_ss1" }, { "node1" : "bbs21", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs21_ss2" }, { "node1" : "bbs22", - "node2" : "BUSCO_ss2" + "node2" : "BUSCO_bbs22_ss2" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl2_ss1" + "node1" : "BUSCO_bbs11_ss1", + "node2" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1" }, { - "node1" : "INTERNAL_vl2_ss1", + "node1" : "INTERNAL_vl2_BUSCO_bbs11_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss1", - "node2" : "INTERNAL_vl2_ss1" + "node1" : "BUSCO_bbs12_ss1", + "node2" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1" }, { - "node1" : "INTERNAL_vl2_ss1", + "node1" : "INTERNAL_vl2_BUSCO_bbs12_ss1-ss1", "node2" : "ss1" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl2_ss2" + "node1" : "BUSCO_bbs21_ss2", + "node2" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2" }, { - "node1" : "INTERNAL_vl2_ss2", + "node1" : "INTERNAL_vl2_BUSCO_bbs21_ss2-ss2", "node2" : "ss2" }, { - "node1" : "BUSCO_ss2", - "node2" : "INTERNAL_vl2_ss2" + "node1" : "BUSCO_bbs22_ss2", + "node2" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2" }, { - "node1" : "INTERNAL_vl2_ss2", + "node1" : "INTERNAL_vl2_BUSCO_bbs22_ss2-ss2", "node2" : "ss2" }, { "node1" : "b1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json index c0c0321d8..e2e78d03a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json @@ -217,14 +217,7 @@ "positionName" : "S_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_dtrct11", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_bload3", + "id" : "idINTERNAL_95_vl2_95_dtrf23_45_btrf23", "vid" : "vl2", "componentType" : "NODE", "open" : false, @@ -276,6 +269,13 @@ "vlabel" : false, "equipmentId" : "dload2", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl3_95_dtrf38_45_btrf38", + "vid" : "vl3", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddload1", "vid" : "vl1", @@ -298,6 +298,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dline11_95_2_45_bline11_95_2", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_trf2_95_ONE", "vid" : "vl1", @@ -312,6 +319,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_trf5_95_ONE", "vid" : "vl1", @@ -326,6 +340,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dload3_45_bload3", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbbs4", "vid" : "vl1", @@ -370,6 +391,13 @@ "id" : "bbs7_NW_LABEL", "positionName" : "NW_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbbs1", "vid" : "vl1", @@ -410,6 +438,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dtrf22_45_btrf22", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddscpl1", "vid" : "vl2", @@ -427,15 +462,15 @@ "equipmentId" : "dscpl2", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl2_95_trf8_95_TWO", - "vid" : "vl2", + "id" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", + "vid" : "vl1", "componentType" : "NODE", "open" : false, "vlabel" : false, "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl3_95_bload4", - "vid" : "vl3", + "id" : "idINTERNAL_95_vl2_95_trf8_95_TWO", + "vid" : "vl2", "componentType" : "NODE", "open" : false, "vlabel" : false, @@ -468,6 +503,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl3_95_dtrf37_45_btrf37", + "vid" : "vl3", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl2_95_trf2_95_TWO", "vid" : "vl2", @@ -530,6 +572,13 @@ "vlabel" : false, "equipmentId" : "dtrf13", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddtrf12", "vid" : "vl1", @@ -545,6 +594,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dtrf21_45_btrf21", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl2_95_trf6_95_TWO", "vid" : "vl2", @@ -552,6 +608,20 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idddcpl1", "vid" : "vl2", @@ -624,6 +694,13 @@ "vlabel" : false, "equipmentId" : "dsect21", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dscpl2_45_ddcpl1", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddsect22", "vid" : "vl1", @@ -633,7 +710,14 @@ "equipmentId" : "dsect22", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl2_95_ddcpl1", + "id" : "idINTERNAL_95_vl1_95_dload2_45_bload2", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dtrf24_45_btrf24", "vid" : "vl2", "componentType" : "NODE", "open" : false, @@ -692,6 +776,13 @@ "vlabel" : false, "equipmentId" : "dtrf24", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddtrf23", "vid" : "vl2", @@ -771,21 +862,7 @@ "vlabel" : false, "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl3_95_btrf25", - "vid" : "vl3", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_bgen1", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_bgen2", + "id" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -834,28 +911,7 @@ "positionName" : "N_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_btrf17", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf16", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf15", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf14", + "id" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -869,20 +925,6 @@ "vlabel" : false, "equipmentId" : "dtrf38", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf13", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf28", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "iddtrf37", "vid" : "vl3", @@ -891,13 +933,6 @@ "vlabel" : false, "equipmentId" : "dtrf37", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf12", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "iddtrf36", "vid" : "vl3", @@ -907,15 +942,8 @@ "equipmentId" : "dtrf36", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_btrf11", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl3_95_btrf38", - "vid" : "vl3", + "id" : "idINTERNAL_95_vl2_95_dtrf27_45_btrf27", + "vid" : "vl2", "componentType" : "NODE", "open" : false, "vlabel" : false, @@ -929,26 +957,19 @@ "equipmentId" : "dtrct21", "labels" : [ ] }, { - "id" : "idbtrf18", + "id" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", "vid" : "vl1", - "componentType" : "BREAKER", - "open" : false, - "vlabel" : false, - "equipmentId" : "btrf18", - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl3_95_btrf37", - "vid" : "vl3", "componentType" : "NODE", "open" : false, "vlabel" : false, "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl3_95_btrf36", - "vid" : "vl3", - "componentType" : "NODE", + "id" : "idbtrf18", + "vid" : "vl1", + "componentType" : "BREAKER", "open" : false, "vlabel" : false, + "equipmentId" : "btrf18", "labels" : [ ] }, { "id" : "idbtrf15", @@ -958,13 +979,6 @@ "vlabel" : false, "equipmentId" : "btrf15", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf24", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbtrf14", "vid" : "vl1", @@ -988,13 +1002,6 @@ "vlabel" : false, "equipmentId" : "btrf17", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf26", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbtrf16", "vid" : "vl1", @@ -1003,13 +1010,6 @@ "vlabel" : false, "equipmentId" : "btrf16", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf27", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbtrf11", "vid" : "vl1", @@ -1018,13 +1018,6 @@ "vlabel" : false, "equipmentId" : "btrf11", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf21", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbtrf13", "vid" : "vl1", @@ -1033,13 +1026,6 @@ "vlabel" : false, "equipmentId" : "btrf13", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf22", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbtrf12", "vid" : "vl1", @@ -1048,20 +1034,6 @@ "vlabel" : false, "equipmentId" : "btrf12", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf18", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl2_95_btrf23", - "vid" : "vl2", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbgen1", "vid" : "vl1", @@ -1103,6 +1075,13 @@ "id" : "trf3_TWO_S_LABEL", "positionName" : "S_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idgen1", "vid" : "vl1", @@ -1168,6 +1147,27 @@ "id" : "trf5_TWO_S_LABEL", "positionName" : "S_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl2_95_dtrf26_45_btrf26", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dscpl1_45_ddcpl1", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbtrf26", "vid" : "vl2", @@ -1200,6 +1200,13 @@ "vlabel" : false, "equipmentId" : "btrf28", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl3_95_dtrf25_45_btrf25", + "vid" : "vl3", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbtrf27", "vid" : "vl2", @@ -1329,6 +1336,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dgen4_45_bgen4", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idtrf3", "vid" : "", @@ -1374,6 +1388,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idtrf5", "vid" : "", @@ -1423,15 +1444,8 @@ "equipmentId" : "trf8", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_bload2", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_bload1", - "vid" : "vl1", + "id" : "idINTERNAL_95_vl3_95_dtrf36_45_btrf36", + "vid" : "vl3", "componentType" : "NODE", "open" : false, "vlabel" : false, @@ -1462,6 +1476,13 @@ "id" : "trf7_TWO_N_LABEL", "positionName" : "N_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbtrf37", "vid" : "vl3", @@ -1478,6 +1499,13 @@ "vlabel" : false, "equipmentId" : "btrf36", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl2_95_dtrf28_45_btrf28", + "vid" : "vl2", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbtrf38", "vid" : "vl3", @@ -1487,8 +1515,8 @@ "equipmentId" : "btrf38", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl2_95_bgen4", - "vid" : "vl2", + "id" : "idINTERNAL_95_vl3_95_dload4_45_bload4", + "vid" : "vl3", "componentType" : "NODE", "open" : false, "vlabel" : false, @@ -1563,14 +1591,7 @@ "positionName" : "N_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_bline11_95_2", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_dtrct21", + "id" : "idINTERNAL_95_vl1_95_dload1_45_bload1", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -1604,9 +1625,9 @@ } ] } ], "wires" : [ { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_bload3_95_bload3", - "nodeId1" : "idINTERNAL_95_vl2_95_bload3", - "nodeId2" : "idbload3", + "id" : "_95_vl3_95_INTERNAL_95_vl3_95_dtrf25_45_btrf25_95_btrf25", + "nodeId1" : "idINTERNAL_95_vl3_95_dtrf25_45_btrf25", + "nodeId2" : "idbtrf25", "straight" : false, "snakeLine" : false }, { @@ -1616,45 +1637,45 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf6_95_TWO_95_trf6_95_TWO", - "nodeId1" : "idINTERNAL_95_vl2_95_trf6_95_TWO", - "nodeId2" : "idtrf6_95_TWO", + "id" : "_95_vl2_95_dtrf22_95_INTERNAL_95_vl2_95_dtrf22_45_btrf22", + "nodeId1" : "iddtrf22", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf22_45_btrf22", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_dtrf25_95_INTERNAL_95_vl3_95_btrf25", - "nodeId1" : "iddtrf25", - "nodeId2" : "idINTERNAL_95_vl3_95_btrf25", + "id" : "_95_vl3_95_dtrf36_95_INTERNAL_95_vl3_95_dtrf36_45_btrf36", + "nodeId1" : "iddtrf36", + "nodeId2" : "idINTERNAL_95_vl3_95_dtrf36_45_btrf36", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_INTERNAL_95_vl3_95_btrf36_95_btrf36", - "nodeId1" : "idINTERNAL_95_vl3_95_btrf36", - "nodeId2" : "idbtrf36", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf26_45_btrf26_95_btrf26", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf26_45_btrf26", + "nodeId2" : "idbtrf26", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_ddcpl1_95_ddcpl1", - "nodeId1" : "idINTERNAL_95_vl2_95_ddcpl1", - "nodeId2" : "idddcpl1", + "id" : "_95_vl1_95_dgen1_95_INTERNAL_95_vl1_95_dgen1_45_bgen1", + "nodeId1" : "iddgen1", + "nodeId2" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_dload4_95_INTERNAL_95_vl3_95_bload4", - "nodeId1" : "iddload4", - "nodeId2" : "idINTERNAL_95_vl3_95_bload4", + "id" : "_95_vl2_95_ddcpl1_95_INTERNAL_95_vl2_95_dscpl2_45_ddcpl1", + "nodeId1" : "idddcpl1", + "nodeId2" : "idINTERNAL_95_vl2_95_dscpl2_45_ddcpl1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_bbs3_95_dtrf17", - "nodeId1" : "idbbs3", - "nodeId2" : "iddtrf17", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf6_95_TWO_95_trf6_95_TWO", + "nodeId1" : "idINTERNAL_95_vl2_95_trf6_95_TWO", + "nodeId2" : "idtrf6_95_TWO", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrct21_95_INTERNAL_95_vl1_95_dtrct21", - "nodeId1" : "iddtrct21", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct21", + "id" : "_95_vl1_95_bbs3_95_dtrf17", + "nodeId1" : "idbbs3", + "nodeId2" : "iddtrf17", "straight" : false, "snakeLine" : false }, { @@ -1664,15 +1685,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf7_95_TWO_95_trf7_95_TWO", - "nodeId1" : "idINTERNAL_95_vl2_95_trf7_95_TWO", - "nodeId2" : "idtrf7_95_TWO", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dscpl2_45_ddcpl1_95_dscpl2", + "nodeId1" : "idINTERNAL_95_vl2_95_dscpl2_45_ddcpl1", + "nodeId2" : "iddscpl2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf16_95_btrf16", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf16", - "nodeId2" : "idbtrf16", + "id" : "_95_vl1_95_dtrct21_95_INTERNAL_95_vl1_95_dsect22_45_dtrct21", + "nodeId1" : "iddtrct21", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf7_95_TWO_95_trf7_95_TWO", + "nodeId1" : "idINTERNAL_95_vl2_95_trf7_95_TWO", + "nodeId2" : "idtrf7_95_TWO", "straight" : false, "snakeLine" : false }, { @@ -1694,15 +1721,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_gen4_95_bgen4", - "nodeId1" : "idINTERNAL_95_vl2_95_gen4", - "nodeId2" : "idbgen4", + "id" : "_95_vl1_95_dtrf16_95_INTERNAL_95_vl1_95_dtrf16_45_btrf16", + "nodeId1" : "iddtrf16", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_INTERNAL_95_vl3_95_btrf37_95_btrf37", - "nodeId1" : "idINTERNAL_95_vl3_95_btrf37", - "nodeId2" : "idbtrf37", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_gen4_95_bgen4", + "nodeId1" : "idINTERNAL_95_vl2_95_gen4", + "nodeId2" : "idbgen4", "straight" : false, "snakeLine" : false }, { @@ -1712,9 +1739,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf18_95_INTERNAL_95_vl1_95_btrf18", - "nodeId1" : "iddtrf18", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf18", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf21_45_btrf21_95_btrf21", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf21_45_btrf21", + "nodeId2" : "idbtrf21", "straight" : false, "snakeLine" : false }, { @@ -1730,9 +1757,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf22_95_btrf22", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf22", - "nodeId2" : "idbtrf22", + "id" : "_95_vl1_95_dsect11_95_INTERNAL_95_vl1_95_dsect11_45_dtrct11", + "nodeId1" : "iddsect11", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf13_95_INTERNAL_95_vl1_95_dtrf13_45_btrf13", + "nodeId1" : "iddtrf13", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", "straight" : false, "snakeLine" : false }, { @@ -1742,9 +1775,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dload2_95_INTERNAL_95_vl1_95_bload2", - "nodeId1" : "iddload2", - "nodeId2" : "idINTERNAL_95_vl1_95_bload2", + "id" : "_95_vl1_95_dgen2_95_INTERNAL_95_vl1_95_dgen2_45_bgen2", + "nodeId1" : "iddgen2", + "nodeId2" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", "straight" : false, "snakeLine" : false }, { @@ -1753,6 +1786,12 @@ "nodeId2" : "idbload2", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf12_45_btrf12_95_btrf12", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", + "nodeId2" : "idbtrf12", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf4_95_TWO_95_trf4_95_TWO", "nodeId1" : "idINTERNAL_95_vl2_95_trf4_95_TWO", @@ -1760,9 +1799,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf17_95_btrf17", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf17", - "nodeId2" : "idbtrf17", + "id" : "_95_vl3_95_INTERNAL_95_vl3_95_dload4_45_bload4_95_bload4", + "nodeId1" : "idINTERNAL_95_vl3_95_dload4_45_bload4", + "nodeId2" : "idbload4", "straight" : false, "snakeLine" : false }, { @@ -1772,15 +1811,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_bbs3_95_dgen1", - "nodeId1" : "idbbs3", - "nodeId2" : "iddgen1", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf18_45_btrf18_95_btrf18", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", + "nodeId2" : "idbtrf18", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrct11_95_INTERNAL_95_vl1_95_dtrct11", - "nodeId1" : "iddtrct11", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct11", + "id" : "_95_vl1_95_bbs3_95_dgen1", + "nodeId1" : "idbbs3", + "nodeId2" : "iddgen1", "straight" : false, "snakeLine" : false }, { @@ -1802,21 +1841,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_trf1_95_ONE_95_trf1_95_ONE", - "nodeId1" : "idINTERNAL_95_vl1_95_trf1_95_ONE", - "nodeId2" : "idtrf1_95_ONE", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dgen4_45_bgen4_95_bgen4", + "nodeId1" : "idINTERNAL_95_vl2_95_dgen4_45_bgen4", + "nodeId2" : "idbgen4", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dtrf27_95_INTERNAL_95_vl2_95_btrf27", - "nodeId1" : "iddtrf27", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf27", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_trf1_95_ONE_95_trf1_95_ONE", + "nodeId1" : "idINTERNAL_95_vl1_95_trf1_95_ONE", + "nodeId2" : "idtrf1_95_ONE", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_ddcpl1_95_dscpl2", - "nodeId1" : "idINTERNAL_95_vl2_95_ddcpl1", - "nodeId2" : "iddscpl2", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf16_45_btrf16_95_btrf16", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", + "nodeId2" : "idbtrf16", "straight" : false, "snakeLine" : false }, { @@ -1832,9 +1871,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf21_95_btrf21", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf21", - "nodeId2" : "idbtrf21", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dload3_45_bload3_95_bload3", + "nodeId1" : "idINTERNAL_95_vl2_95_dload3_45_bload3", + "nodeId2" : "idbload3", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect12_45_dtrct11_95_dsect12", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", + "nodeId2" : "iddsect12", "straight" : false, "snakeLine" : false }, { @@ -1861,6 +1906,12 @@ "nodeId2" : "idtrf2", "straight" : false, "snakeLine" : true + }, { + "id" : "_95_vl3_95_dtrf25_95_INTERNAL_95_vl3_95_dtrf25_45_btrf25", + "nodeId1" : "iddtrf25", + "nodeId2" : "idINTERNAL_95_vl3_95_dtrf25_45_btrf25", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl3_95_bbs7_95_dtrf36", "nodeId1" : "idbbs7", @@ -1868,15 +1919,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_bbs7_95_dtrf37", - "nodeId1" : "idbbs7", - "nodeId2" : "iddtrf37", + "id" : "_95_vl3_95_dtrf38_95_INTERNAL_95_vl3_95_dtrf38_45_btrf38", + "nodeId1" : "iddtrf38", + "nodeId2" : "idINTERNAL_95_vl3_95_dtrf38_45_btrf38", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct21_95_dsect22", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct21", - "nodeId2" : "iddsect22", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf27_45_btrf27_95_btrf27", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf27_45_btrf27", + "nodeId2" : "idbtrf27", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl3_95_bbs7_95_dtrf37", + "nodeId1" : "idbbs7", + "nodeId2" : "iddtrf37", "straight" : false, "snakeLine" : false }, { @@ -1909,30 +1966,30 @@ "nodeId2" : "idINTERNAL_95_vl2_95_trf8_95_TWO", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl2_95_dtrf28_95_INTERNAL_95_vl2_95_btrf28", - "nodeId1" : "iddtrf28", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf28", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf24_95_btrf24", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf24", - "nodeId2" : "idbtrf24", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_INTERNAL_95_vl1_95_gen2_95_bgen2", "nodeId1" : "idINTERNAL_95_vl1_95_gen2", "nodeId2" : "idbgen2", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf14_95_INTERNAL_95_vl1_95_dtrf14_45_btrf14", + "nodeId1" : "iddtrf14", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_INTERNAL_95_vl2_95_load3_95_bload3", "nodeId1" : "idINTERNAL_95_vl2_95_load3", "nodeId2" : "idbload3", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl3_95_INTERNAL_95_vl3_95_dtrf38_45_btrf38_95_btrf38", + "nodeId1" : "idINTERNAL_95_vl3_95_dtrf38_45_btrf38", + "nodeId2" : "idbtrf38", + "straight" : false, + "snakeLine" : false }, { "id" : "idEDGE_95_trf2_95_ONE", "nodeId1" : "idtrf2_95_ONE", @@ -1957,24 +2014,6 @@ "nodeId2" : "idtrf2_95_TWO", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_dtrf17_95_INTERNAL_95_vl1_95_btrf17", - "nodeId1" : "iddtrf17", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf17", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl3_95_INTERNAL_95_vl3_95_btrf25_95_btrf25", - "nodeId1" : "idINTERNAL_95_vl3_95_btrf25", - "nodeId2" : "idbtrf25", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dgen2_95_INTERNAL_95_vl1_95_bgen2", - "nodeId1" : "iddgen2", - "nodeId2" : "idINTERNAL_95_vl1_95_bgen2", - "straight" : false, - "snakeLine" : false }, { "id" : "idEDGE_95_trf1_95_ONE", "nodeId1" : "idtrf1_95_ONE", @@ -1982,15 +2021,9 @@ "straight" : false, "snakeLine" : true }, { - "id" : "_95_vl2_95_dgen4_95_INTERNAL_95_vl2_95_bgen4", - "nodeId1" : "iddgen4", - "nodeId2" : "idINTERNAL_95_vl2_95_bgen4", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf11_95_btrf11", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf11", - "nodeId2" : "idbtrf11", + "id" : "_95_vl2_95_dtrf28_95_INTERNAL_95_vl2_95_dtrf28_45_btrf28", + "nodeId1" : "iddtrf28", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf28_45_btrf28", "straight" : false, "snakeLine" : false }, { @@ -2000,15 +2033,15 @@ "straight" : false, "snakeLine" : true }, { - "id" : "_95_vl3_95_bload4_95_INTERNAL_95_vl3_95_load4", - "nodeId1" : "idbload4", - "nodeId2" : "idINTERNAL_95_vl3_95_load4", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf22_45_btrf22_95_btrf22", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf22_45_btrf22", + "nodeId2" : "idbtrf22", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bline11_95_2_95_bline11_95_2", - "nodeId1" : "idINTERNAL_95_vl1_95_bline11_95_2", - "nodeId2" : "idbline11_95_2", + "id" : "_95_vl3_95_bload4_95_INTERNAL_95_vl3_95_load4", + "nodeId1" : "idbload4", + "nodeId2" : "idINTERNAL_95_vl3_95_load4", "straight" : false, "snakeLine" : false }, { @@ -2018,21 +2051,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf3_95_TWO_95_trf3_95_TWO", - "nodeId1" : "idINTERNAL_95_vl2_95_trf3_95_TWO", - "nodeId2" : "idtrf3_95_TWO", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect21_45_dtrct21_95_dtrct21", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", + "nodeId2" : "iddtrct21", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bgen2_95_bgen2", - "nodeId1" : "idINTERNAL_95_vl1_95_bgen2", - "nodeId2" : "idbgen2", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf3_95_TWO_95_trf3_95_TWO", + "nodeId1" : "idINTERNAL_95_vl2_95_trf3_95_TWO", + "nodeId2" : "idtrf3_95_TWO", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_ddcpl1_95_INTERNAL_95_vl2_95_ddcpl1", - "nodeId1" : "idddcpl1", - "nodeId2" : "idINTERNAL_95_vl2_95_ddcpl1", + "id" : "_95_vl2_95_dtrf23_95_INTERNAL_95_vl2_95_dtrf23_45_btrf23", + "nodeId1" : "iddtrf23", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf23_45_btrf23", "straight" : false, "snakeLine" : false }, { @@ -2054,15 +2087,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_bbs5_95_dtrf21", - "nodeId1" : "idbbs5", - "nodeId2" : "iddtrf21", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect11_45_dtrct11_95_dtrct11", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", + "nodeId2" : "iddtrct11", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dgen1_95_INTERNAL_95_vl1_95_bgen1", - "nodeId1" : "iddgen1", - "nodeId2" : "idINTERNAL_95_vl1_95_bgen1", + "id" : "_95_vl2_95_bbs5_95_dtrf21", + "nodeId1" : "idbbs5", + "nodeId2" : "iddtrf21", "straight" : false, "snakeLine" : false }, { @@ -2072,21 +2105,27 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf27_95_btrf27", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf27", - "nodeId2" : "idbtrf27", + "id" : "_95_vl1_95_dtrf11_95_INTERNAL_95_vl1_95_dtrf11_45_btrf11", + "nodeId1" : "iddtrf11", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_btrf37_95_INTERNAL_95_vl3_95_trf7_95_THREE", - "nodeId1" : "idbtrf37", - "nodeId2" : "idINTERNAL_95_vl3_95_trf7_95_THREE", + "id" : "_95_vl2_95_dload3_95_INTERNAL_95_vl2_95_dload3_45_bload3", + "nodeId1" : "iddload3", + "nodeId2" : "idINTERNAL_95_vl2_95_dload3_45_bload3", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf14_95_INTERNAL_95_vl1_95_btrf14", - "nodeId1" : "iddtrf14", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf14", + "id" : "_95_vl2_95_dscpl1_95_INTERNAL_95_vl2_95_dscpl1_45_ddcpl1", + "nodeId1" : "iddscpl1", + "nodeId2" : "idINTERNAL_95_vl2_95_dscpl1_45_ddcpl1", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl3_95_btrf37_95_INTERNAL_95_vl3_95_trf7_95_THREE", + "nodeId1" : "idbtrf37", + "nodeId2" : "idINTERNAL_95_vl3_95_trf7_95_THREE", "straight" : false, "snakeLine" : false }, { @@ -2095,6 +2134,12 @@ "nodeId2" : "idtrf5", "straight" : false, "snakeLine" : true + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect22_45_dtrct21_95_dsect22", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", + "nodeId2" : "iddsect22", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl3_95_INTERNAL_95_vl3_95_trf7_95_THREE_95_trf7_95_THREE", "nodeId1" : "idINTERNAL_95_vl3_95_trf7_95_THREE", @@ -2108,21 +2153,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dtrf21_95_INTERNAL_95_vl2_95_btrf21", - "nodeId1" : "iddtrf21", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf21", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl3_95_dtrf38_95_INTERNAL_95_vl3_95_btrf38", - "nodeId1" : "iddtrf38", - "nodeId2" : "idINTERNAL_95_vl3_95_btrf38", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl3_95_INTERNAL_95_vl3_95_btrf38_95_btrf38", - "nodeId1" : "idINTERNAL_95_vl3_95_btrf38", - "nodeId2" : "idbtrf38", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf11_45_btrf11_95_btrf11", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", + "nodeId2" : "idbtrf11", "straight" : false, "snakeLine" : false }, { @@ -2132,9 +2165,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf13_95_btrf13", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf13", - "nodeId2" : "idbtrf13", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf15_45_btrf15_95_btrf15", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "nodeId2" : "idbtrf15", "straight" : false, "snakeLine" : false }, { @@ -2143,6 +2176,12 @@ "nodeId2" : "idINTERNAL_95_vl1_95_trf3_95_ONE", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl2_95_dtrf26_95_INTERNAL_95_vl2_95_dtrf26_45_btrf26", + "nodeId1" : "iddtrf26", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf26_45_btrf26", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl3_95_btrf36_95_INTERNAL_95_vl3_95_trf6_95_THREE", "nodeId1" : "idbtrf36", @@ -2156,39 +2195,39 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dtrf22_95_INTERNAL_95_vl2_95_btrf22", - "nodeId1" : "iddtrf22", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf22", + "id" : "_95_vl1_95_dtrf12_95_INTERNAL_95_vl1_95_dtrf12_45_btrf12", + "nodeId1" : "iddtrf12", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_INTERNAL_95_vl3_95_bload4_95_bload4", - "nodeId1" : "idINTERNAL_95_vl3_95_bload4", - "nodeId2" : "idbload4", + "id" : "_95_vl1_95_dsect21_95_INTERNAL_95_vl1_95_dsect21_45_dtrct21", + "nodeId1" : "iddsect21", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf11_95_INTERNAL_95_vl1_95_btrf11", - "nodeId1" : "iddtrf11", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf11", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dline11_95_2_45_bline11_95_2_95_bline11_95_2", + "nodeId1" : "idINTERNAL_95_vl1_95_dline11_95_2_45_bline11_95_2", + "nodeId2" : "idbline11_95_2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bgen1_95_bgen1", - "nodeId1" : "idINTERNAL_95_vl1_95_bgen1", - "nodeId2" : "idbgen1", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf28_45_btrf28_95_btrf28", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf28_45_btrf28", + "nodeId2" : "idbtrf28", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_bbs5_95_dload3", - "nodeId1" : "idbbs5", - "nodeId2" : "iddload3", + "id" : "_95_vl3_95_INTERNAL_95_vl3_95_dtrf37_45_btrf37_95_btrf37", + "nodeId1" : "idINTERNAL_95_vl3_95_dtrf37_45_btrf37", + "nodeId2" : "idbtrf37", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dtrf23_95_INTERNAL_95_vl2_95_btrf23", - "nodeId1" : "iddtrf23", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf23", + "id" : "_95_vl2_95_bbs5_95_dload3", + "nodeId1" : "idbbs5", + "nodeId2" : "iddload3", "straight" : false, "snakeLine" : false }, { @@ -2198,15 +2237,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_bbs5_95_dscpl1", - "nodeId1" : "idbbs5", - "nodeId2" : "iddscpl1", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dgen2_45_bgen2_95_bgen2", + "nodeId1" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", + "nodeId2" : "idbgen2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf26_95_btrf26", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf26", - "nodeId2" : "idbtrf26", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dscpl1_45_ddcpl1_95_ddcpl1", + "nodeId1" : "idINTERNAL_95_vl2_95_dscpl1_45_ddcpl1", + "nodeId2" : "idddcpl1", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl2_95_bbs5_95_dscpl1", + "nodeId1" : "idbbs5", + "nodeId2" : "iddscpl1", "straight" : false, "snakeLine" : false }, { @@ -2215,12 +2260,6 @@ "nodeId2" : "idtrf6", "straight" : false, "snakeLine" : true - }, { - "id" : "_95_vl1_95_dtrf12_95_INTERNAL_95_vl1_95_btrf12", - "nodeId1" : "iddtrf12", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf12", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_btrf14_95_INTERNAL_95_vl1_95_trf4_95_ONE", "nodeId1" : "idbtrf14", @@ -2228,15 +2267,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dtrf24_95_INTERNAL_95_vl2_95_btrf24", - "nodeId1" : "iddtrf24", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf24", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl2_95_dload3_95_INTERNAL_95_vl2_95_bload3", - "nodeId1" : "iddload3", - "nodeId2" : "idINTERNAL_95_vl2_95_bload3", + "id" : "_95_vl2_95_dtrf21_95_INTERNAL_95_vl2_95_dtrf21_45_btrf21", + "nodeId1" : "iddtrf21", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf21_45_btrf21", "straight" : false, "snakeLine" : false }, { @@ -2246,33 +2279,33 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct11_95_dsect12", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct11", - "nodeId2" : "iddsect12", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dgen1_45_bgen1_95_bgen1", + "nodeId1" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", + "nodeId2" : "idbgen1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf13_95_INTERNAL_95_vl1_95_btrf13", - "nodeId1" : "iddtrf13", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf13", + "id" : "_95_vl2_95_btrf24_95_INTERNAL_95_vl2_95_trf4_95_TWO", + "nodeId1" : "idbtrf24", + "nodeId2" : "idINTERNAL_95_vl2_95_trf4_95_TWO", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf14_95_btrf14", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf14", - "nodeId2" : "idbtrf14", + "id" : "_95_vl3_95_dtrf37_95_INTERNAL_95_vl3_95_dtrf37_45_btrf37", + "nodeId1" : "iddtrf37", + "nodeId2" : "idINTERNAL_95_vl3_95_dtrf37_45_btrf37", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_dscpl1_95_INTERNAL_95_vl2_95_ddcpl1", - "nodeId1" : "iddscpl1", - "nodeId2" : "idINTERNAL_95_vl2_95_ddcpl1", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf23_45_btrf23_95_btrf23", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf23_45_btrf23", + "nodeId2" : "idbtrf23", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl2_95_btrf24_95_INTERNAL_95_vl2_95_trf4_95_TWO", - "nodeId1" : "idbtrf24", - "nodeId2" : "idINTERNAL_95_vl2_95_trf4_95_TWO", + "id" : "_95_vl3_95_INTERNAL_95_vl3_95_dtrf36_45_btrf36_95_btrf36", + "nodeId1" : "idINTERNAL_95_vl3_95_dtrf36_45_btrf36", + "nodeId2" : "idbtrf36", "straight" : false, "snakeLine" : false }, { @@ -2300,9 +2333,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_dtrf37_95_INTERNAL_95_vl3_95_btrf37", - "nodeId1" : "iddtrf37", - "nodeId2" : "idINTERNAL_95_vl3_95_btrf37", + "id" : "_95_vl1_95_dtrf17_95_INTERNAL_95_vl1_95_dtrf17_45_btrf17", + "nodeId1" : "iddtrf17", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", "straight" : false, "snakeLine" : false }, { @@ -2311,24 +2344,12 @@ "nodeId2" : "idtrf6", "straight" : false, "snakeLine" : true - }, { - "id" : "_95_vl1_95_dline11_95_2_95_INTERNAL_95_vl1_95_bline11_95_2", - "nodeId1" : "iddline11_95_2", - "nodeId2" : "idINTERNAL_95_vl1_95_bline11_95_2", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl2_95_dscpl2_95_bbs6", "nodeId1" : "iddscpl2", "nodeId2" : "idbbs6", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_bgen4_95_bgen4", - "nodeId1" : "idINTERNAL_95_vl2_95_bgen4", - "nodeId2" : "idbgen4", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_INTERNAL_95_vl1_95_trf5_95_ONE_95_trf5_95_ONE", "nodeId1" : "idINTERNAL_95_vl1_95_trf5_95_ONE", @@ -2336,9 +2357,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bload2_95_bload2", - "nodeId1" : "idINTERNAL_95_vl1_95_bload2", - "nodeId2" : "idbload2", + "id" : "_95_vl1_95_dload1_95_INTERNAL_95_vl1_95_dload1_45_bload1", + "nodeId1" : "iddload1", + "nodeId2" : "idINTERNAL_95_vl1_95_dload1_45_bload1", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf14_45_btrf14_95_btrf14", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", + "nodeId2" : "idbtrf14", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrct11_95_INTERNAL_95_vl1_95_dsect12_45_dtrct11", + "nodeId1" : "iddtrct11", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", "straight" : false, "snakeLine" : false }, { @@ -2348,9 +2381,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf15_95_INTERNAL_95_vl1_95_btrf15", - "nodeId1" : "iddtrf15", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf15", + "id" : "_95_vl2_95_dtrf24_95_INTERNAL_95_vl2_95_dtrf24_45_btrf24", + "nodeId1" : "iddtrf24", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf24_45_btrf24", "straight" : false, "snakeLine" : false }, { @@ -2371,18 +2404,6 @@ "nodeId2" : "iddload2", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf28_95_btrf28", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf28", - "nodeId2" : "idbtrf28", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dtrf16_95_INTERNAL_95_vl1_95_btrf16", - "nodeId1" : "iddtrf16", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf16", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl2_95_INTERNAL_95_vl2_95_trf1_95_TWO_95_trf1_95_TWO", "nodeId1" : "idINTERNAL_95_vl2_95_trf1_95_TWO", @@ -2407,12 +2428,6 @@ "nodeId2" : "idtrf5_95_TWO", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_dsect11_95_INTERNAL_95_vl1_95_dtrct11", - "nodeId1" : "iddsect11", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct11", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_btrf11_95_INTERNAL_95_vl1_95_trf1_95_ONE", "nodeId1" : "idbtrf11", @@ -2437,6 +2452,12 @@ "nodeId2" : "idtrf4", "straight" : false, "snakeLine" : true + }, { + "id" : "_95_vl1_95_dline11_95_2_95_INTERNAL_95_vl1_95_dline11_95_2_45_bline11_95_2", + "nodeId1" : "iddline11_95_2", + "nodeId2" : "idINTERNAL_95_vl1_95_dline11_95_2_45_bline11_95_2", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_bbs6_95_dtrf22", "nodeId1" : "idbbs6", @@ -2455,6 +2476,12 @@ "nodeId2" : "idtrf8", "straight" : false, "snakeLine" : true + }, { + "id" : "_95_vl1_95_dtrf18_95_INTERNAL_95_vl1_95_dtrf18_45_btrf18", + "nodeId1" : "iddtrf18", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl2_95_bbs6_95_dtrf23", "nodeId1" : "idbbs6", @@ -2473,12 +2500,6 @@ "nodeId2" : "iddtrf26", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct11_95_dtrct11", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct11", - "nodeId2" : "iddtrct11", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl2_95_bbs6_95_dtrf28", "nodeId1" : "idbbs6", @@ -2492,27 +2513,27 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_btrf25_95_INTERNAL_95_vl3_95_trf5_95_TWO", - "nodeId1" : "idbtrf25", - "nodeId2" : "idINTERNAL_95_vl3_95_trf5_95_TWO", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dload1_45_bload1_95_bload1", + "nodeId1" : "idINTERNAL_95_vl1_95_dload1_45_bload1", + "nodeId2" : "idbload1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_btrf38_95_INTERNAL_95_vl3_95_trf8_95_THREE", - "nodeId1" : "idbtrf38", - "nodeId2" : "idINTERNAL_95_vl3_95_trf8_95_THREE", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dload2_45_bload2_95_bload2", + "nodeId1" : "idINTERNAL_95_vl1_95_dload2_45_bload2", + "nodeId2" : "idbload2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dload1_95_INTERNAL_95_vl1_95_bload1", - "nodeId1" : "iddload1", - "nodeId2" : "idINTERNAL_95_vl1_95_bload1", + "id" : "_95_vl3_95_btrf25_95_INTERNAL_95_vl3_95_trf5_95_TWO", + "nodeId1" : "idbtrf25", + "nodeId2" : "idINTERNAL_95_vl3_95_trf5_95_TWO", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl3_95_dtrf36_95_INTERNAL_95_vl3_95_btrf36", - "nodeId1" : "iddtrf36", - "nodeId2" : "idINTERNAL_95_vl3_95_btrf36", + "id" : "_95_vl3_95_btrf38_95_INTERNAL_95_vl3_95_trf8_95_THREE", + "nodeId1" : "idbtrf38", + "nodeId2" : "idINTERNAL_95_vl3_95_trf8_95_THREE", "straight" : false, "snakeLine" : false }, { @@ -2522,15 +2543,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bload1_95_bload1", - "nodeId1" : "idINTERNAL_95_vl1_95_bload1", - "nodeId2" : "idbload1", + "id" : "_95_vl3_95_dload4_95_INTERNAL_95_vl3_95_dload4_45_bload4", + "nodeId1" : "iddload4", + "nodeId2" : "idINTERNAL_95_vl3_95_dload4_45_bload4", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf12_95_btrf12", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf12", - "nodeId2" : "idbtrf12", + "id" : "_95_vl2_95_dtrf27_95_INTERNAL_95_vl2_95_dtrf27_45_btrf27", + "nodeId1" : "iddtrf27", + "nodeId2" : "idINTERNAL_95_vl2_95_dtrf27_45_btrf27", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dload2_95_INTERNAL_95_vl1_95_dload2_45_bload2", + "nodeId1" : "iddload2", + "nodeId2" : "idINTERNAL_95_vl1_95_dload2_45_bload2", "straight" : false, "snakeLine" : false }, { @@ -2551,12 +2578,6 @@ "nodeId2" : "iddsect21", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf18_95_btrf18", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf18", - "nodeId2" : "idbtrf18", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl3_95_INTERNAL_95_vl3_95_trf6_95_THREE_95_trf6_95_THREE", "nodeId1" : "idINTERNAL_95_vl3_95_trf6_95_THREE", @@ -2569,6 +2590,12 @@ "nodeId2" : "iddtrf12", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl2_95_dgen4_95_INTERNAL_95_vl2_95_dgen4_45_bgen4", + "nodeId1" : "iddgen4", + "nodeId2" : "idINTERNAL_95_vl2_95_dgen4_45_bgen4", + "straight" : false, + "snakeLine" : false }, { "id" : "idEDGE_95_trf7_95_TWO", "nodeId1" : "idtrf7_95_TWO", @@ -2576,39 +2603,27 @@ "straight" : false, "snakeLine" : true }, { - "id" : "_95_vl2_95_INTERNAL_95_vl2_95_btrf23_95_btrf23", - "nodeId1" : "idINTERNAL_95_vl2_95_btrf23", - "nodeId2" : "idbtrf23", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dsect22_95_bbs4", - "nodeId1" : "iddsect22", - "nodeId2" : "idbbs4", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl2_95_dtrf26_95_INTERNAL_95_vl2_95_btrf26", - "nodeId1" : "iddtrf26", - "nodeId2" : "idINTERNAL_95_vl2_95_btrf26", + "id" : "_95_vl2_95_INTERNAL_95_vl2_95_dtrf24_45_btrf24_95_btrf24", + "nodeId1" : "idINTERNAL_95_vl2_95_dtrf24_45_btrf24", + "nodeId2" : "idbtrf24", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dsect21_95_INTERNAL_95_vl1_95_dtrct21", - "nodeId1" : "iddsect21", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct21", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf13_45_btrf13_95_btrf13", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", + "nodeId2" : "idbtrf13", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct21_95_dtrct21", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct21", - "nodeId2" : "iddtrct21", + "id" : "_95_vl1_95_dsect22_95_bbs4", + "nodeId1" : "iddsect22", + "nodeId2" : "idbbs4", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf15_95_btrf15", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf15", - "nodeId2" : "idbtrf15", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf17_45_btrf17_95_btrf17", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", + "nodeId2" : "idbtrf17", "straight" : false, "snakeLine" : false }, { @@ -2623,6 +2638,12 @@ "nodeId2" : "idtrf8_95_THREE", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf15_95_INTERNAL_95_vl1_95_dtrf15_45_btrf15", + "nodeId1" : "iddtrf15", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_gen2_95_INTERNAL_95_vl1_95_gen2", "nodeId1" : "idgen2", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg index d6ecd2c6e..4b82c98ee 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg @@ -148,43 +148,43 @@ bbs2 - + - + - + - + - + - + - + - + - + - + - + @@ -220,7 +220,7 @@ - + @@ -247,10 +247,10 @@ - + - + @@ -270,7 +270,7 @@ - + @@ -288,10 +288,10 @@ - + - + @@ -311,7 +311,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testDoubleForkNode.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testDoubleForkNode.json index c08760e59..789b13a74 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testDoubleForkNode.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testDoubleForkNode.json @@ -8,46 +8,46 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_bCD1", - "componentType" : "BUS_CONNECTION", - "fictitious" : true, - "x" : 125.0, - "y" : 225.0 - }, { - "type" : "INTERNAL", - "id" : "BUSCO_bCD2", + "id" : "BUSCO_bbs13_bCD2", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 25.0, "y" : 200.0 }, { "type" : "INTERNAL", - "id" : "BUSCO_bCD3", + "id" : "BUSCO_bbs13_bCD3", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 75.0, "y" : 200.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bCD1", - "componentType" : "NODE", + "id" : "BUSCO_bbs23_bCD1", + "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 125.0, - "y" : 170.0 + "y" : 225.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bCD2", + "id" : "INTERNAL_vl1_BUSCO_bbs13_bCD2-bCD2", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 170.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_bCD3", + "id" : "INTERNAL_vl1_BUSCO_bbs13_bCD3-bCD3", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, "y" : 170.0 + }, { + "type" : "INTERNAL", + "id" : "INTERNAL_vl1_BUSCO_bbs23_bCD1-bCD1", + "componentType" : "NODE", + "fictitious" : true, + "x" : 125.0, + "y" : 170.0 }, { "type" : "INTERNAL", "id" : "INTERNAL_vl1_loadC", @@ -258,7 +258,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs13", "BUSCO_bCD2", "INTERNAL_vl1_bCD2" ] + "nodes" : [ "bbs13", "BUSCO_bbs13_bCD2", "INTERNAL_vl1_BUSCO_bbs13_bCD2-bCD2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -279,7 +279,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl1_bCD2", "bCD2", "INTERNAL_vl1_loadC_fork" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs13_bCD2-bCD2", "bCD2", "INTERNAL_vl1_loadC_fork" ] } ] }, { "type" : "SERIAL", @@ -321,7 +321,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs13", "BUSCO_bCD3", "INTERNAL_vl1_bCD3" ] + "nodes" : [ "bbs13", "BUSCO_bbs13_bCD3", "INTERNAL_vl1_BUSCO_bbs13_bCD3-bCD3" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -342,7 +342,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl1_bCD3", "bCD3", "INTERNAL_vl1_loadC_fork" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs13_bCD3-bCD3", "bCD3", "INTERNAL_vl1_loadC_fork" ] } ] }, { "type" : "SERIAL", @@ -384,7 +384,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs23", "BUSCO_bCD1", "INTERNAL_vl1_bCD1" ] + "nodes" : [ "bbs23", "BUSCO_bbs23_bCD1", "INTERNAL_vl1_BUSCO_bbs23_bCD1-bCD1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -405,7 +405,7 @@ "xSpan" : 50.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl1_bCD1", "bCD1", "INTERNAL_vl1_loadC_fork" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs23_bCD1-bCD1", "bCD1", "INTERNAL_vl1_loadC_fork" ] } ] } ] }, { @@ -560,30 +560,30 @@ } ], "edges" : [ { "node1" : "bbs13", - "node2" : "BUSCO_bCD2" + "node2" : "BUSCO_bbs13_bCD2" }, { "node1" : "bbs13", - "node2" : "BUSCO_bCD3" + "node2" : "BUSCO_bbs13_bCD3" }, { "node1" : "bbs23", - "node2" : "BUSCO_bCD1" + "node2" : "BUSCO_bbs23_bCD1" }, { - "node1" : "BUSCO_bCD2", - "node2" : "INTERNAL_vl1_bCD2" + "node1" : "BUSCO_bbs13_bCD2", + "node2" : "INTERNAL_vl1_BUSCO_bbs13_bCD2-bCD2" }, { - "node1" : "INTERNAL_vl1_bCD2", + "node1" : "INTERNAL_vl1_BUSCO_bbs13_bCD2-bCD2", "node2" : "bCD2" }, { - "node1" : "BUSCO_bCD3", - "node2" : "INTERNAL_vl1_bCD3" + "node1" : "BUSCO_bbs13_bCD3", + "node2" : "INTERNAL_vl1_BUSCO_bbs13_bCD3-bCD3" }, { - "node1" : "INTERNAL_vl1_bCD3", + "node1" : "INTERNAL_vl1_BUSCO_bbs13_bCD3-bCD3", "node2" : "bCD3" }, { - "node1" : "BUSCO_bCD1", - "node2" : "INTERNAL_vl1_bCD1" + "node1" : "BUSCO_bbs23_bCD1", + "node2" : "INTERNAL_vl1_BUSCO_bbs23_bCD1-bCD1" }, { - "node1" : "INTERNAL_vl1_bCD1", + "node1" : "INTERNAL_vl1_BUSCO_bbs23_bCD1-bCD1", "node2" : "bCD1" }, { "node1" : "bCD1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testFlatSections.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testFlatSections.json index caafd8c7f..7ff1e5836 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testFlatSections.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testFlatSections.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_d112", + "id" : "BUSCO_bbs11_d112", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_d112", + "id" : "BUSCO_bbs12_d112", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -24,7 +24,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_d212", + "id" : "BUSCO_bbs21_d212", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, @@ -32,7 +32,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "BUSCO_d212", + "id" : "BUSCO_bbs22_d212", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 100.0, @@ -40,66 +40,66 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_b123", + "id" : "INTERNAL_vl1_BUSCO_bbs11_d112-d112", "componentType" : "NODE", "fictitious" : true, - "x" : 150.0, + "x" : 50.0, "y" : 0.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_b123", + "id" : "INTERNAL_vl1_BUSCO_bbs12_d112-d112", "componentType" : "NODE", "fictitious" : true, - "x" : 200.0, + "x" : 100.0, "y" : 0.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_b223", + "id" : "INTERNAL_vl1_BUSCO_bbs21_d212-d212", "componentType" : "NODE", "fictitious" : true, - "x" : 150.0, + "x" : 50.0, "y" : 25.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_b223", + "id" : "INTERNAL_vl1_BUSCO_bbs22_d212-d212", "componentType" : "NODE", "fictitious" : true, - "x" : 200.0, + "x" : 100.0, "y" : 25.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_d112", + "id" : "INTERNAL_vl1_d123a-b123", "componentType" : "NODE", "fictitious" : true, - "x" : 50.0, + "x" : 150.0, "y" : 0.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_d112", + "id" : "INTERNAL_vl1_d123b-b123", "componentType" : "NODE", "fictitious" : true, - "x" : 100.0, + "x" : 200.0, "y" : 0.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_d212", + "id" : "INTERNAL_vl1_d223a-b223", "componentType" : "NODE", "fictitious" : true, - "x" : 50.0, + "x" : 150.0, "y" : 25.0, "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl1_d212", + "id" : "INTERNAL_vl1_d223b-b223", "componentType" : "NODE", "fictitious" : true, - "x" : 100.0, + "x" : 200.0, "y" : 25.0, "orientation" : "RIGHT" }, { @@ -351,7 +351,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "BUSCO_d112", "INTERNAL_vl1_d112" ] + "nodes" : [ "bbs12", "BUSCO_bbs12_d112", "INTERNAL_vl1_BUSCO_bbs12_d112-d112" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -372,7 +372,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_d112", "d112", "INTERNAL_vl1_d112" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs11_d112-d112", "d112", "INTERNAL_vl1_BUSCO_bbs12_d112-d112" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -393,7 +393,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "BUSCO_d112", "INTERNAL_vl1_d112" ] + "nodes" : [ "bbs11", "BUSCO_bbs11_d112", "INTERNAL_vl1_BUSCO_bbs11_d112-d112" ] } ] } }, { @@ -440,7 +440,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "BUSCO_d212", "INTERNAL_vl1_d212" ] + "nodes" : [ "bbs22", "BUSCO_bbs22_d212", "INTERNAL_vl1_BUSCO_bbs22_d212-d212" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -461,7 +461,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_d212", "d212", "INTERNAL_vl1_d212" ] + "nodes" : [ "INTERNAL_vl1_BUSCO_bbs21_d212-d212", "d212", "INTERNAL_vl1_BUSCO_bbs22_d212-d212" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -482,7 +482,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs21", "BUSCO_d212", "INTERNAL_vl1_d212" ] + "nodes" : [ "bbs21", "BUSCO_bbs21_d212", "INTERNAL_vl1_BUSCO_bbs21_d212-d212" ] } ] } }, { @@ -529,7 +529,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs13", "d123b", "INTERNAL_vl1_b123" ] + "nodes" : [ "bbs13", "d123b", "INTERNAL_vl1_d123b-b123" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -550,7 +550,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_b123", "b123", "INTERNAL_vl1_b123" ] + "nodes" : [ "INTERNAL_vl1_d123a-b123", "b123", "INTERNAL_vl1_d123b-b123" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -571,7 +571,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "d123a", "INTERNAL_vl1_b123" ] + "nodes" : [ "bbs12", "d123a", "INTERNAL_vl1_d123a-b123" ] } ] } }, { @@ -618,7 +618,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs23", "d223b", "INTERNAL_vl1_b223" ] + "nodes" : [ "bbs23", "d223b", "INTERNAL_vl1_d223b-b223" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -639,7 +639,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl1_b223", "b223", "INTERNAL_vl1_b223" ] + "nodes" : [ "INTERNAL_vl1_d223a-b223", "b223", "INTERNAL_vl1_d223b-b223" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -660,7 +660,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "d223a", "INTERNAL_vl1_b223" ] + "nodes" : [ "bbs22", "d223a", "INTERNAL_vl1_d223a-b223" ] } ] } } ], @@ -678,63 +678,63 @@ "node2" : "bbs23" }, { "node1" : "bbs11", - "node2" : "BUSCO_d112" + "node2" : "BUSCO_bbs11_d112" }, { "node1" : "bbs21", - "node2" : "BUSCO_d212" + "node2" : "BUSCO_bbs21_d212" }, { - "node1" : "BUSCO_d112", + "node1" : "BUSCO_bbs12_d112", "node2" : "bbs12" }, { - "node1" : "BUSCO_d212", + "node1" : "BUSCO_bbs22_d212", "node2" : "bbs22" }, { - "node1" : "BUSCO_d112", - "node2" : "INTERNAL_vl1_d112" + "node1" : "BUSCO_bbs11_d112", + "node2" : "INTERNAL_vl1_BUSCO_bbs11_d112-d112" }, { - "node1" : "INTERNAL_vl1_d112", + "node1" : "INTERNAL_vl1_BUSCO_bbs11_d112-d112", "node2" : "d112" }, { - "node1" : "BUSCO_d212", - "node2" : "INTERNAL_vl1_d212" + "node1" : "BUSCO_bbs21_d212", + "node2" : "INTERNAL_vl1_BUSCO_bbs21_d212-d212" }, { - "node1" : "INTERNAL_vl1_d212", + "node1" : "INTERNAL_vl1_BUSCO_bbs21_d212-d212", "node2" : "d212" }, { "node1" : "d123a", - "node2" : "INTERNAL_vl1_b123" + "node2" : "INTERNAL_vl1_d123a-b123" }, { - "node1" : "INTERNAL_vl1_b123", + "node1" : "INTERNAL_vl1_d123a-b123", "node2" : "b123" }, { "node1" : "d112", - "node2" : "INTERNAL_vl1_d112" + "node2" : "INTERNAL_vl1_BUSCO_bbs12_d112-d112" }, { - "node1" : "INTERNAL_vl1_d112", - "node2" : "BUSCO_d112" + "node1" : "INTERNAL_vl1_BUSCO_bbs12_d112-d112", + "node2" : "BUSCO_bbs12_d112" }, { "node1" : "d223a", - "node2" : "INTERNAL_vl1_b223" + "node2" : "INTERNAL_vl1_d223a-b223" }, { - "node1" : "INTERNAL_vl1_b223", + "node1" : "INTERNAL_vl1_d223a-b223", "node2" : "b223" }, { "node1" : "d212", - "node2" : "INTERNAL_vl1_d212" + "node2" : "INTERNAL_vl1_BUSCO_bbs22_d212-d212" }, { - "node1" : "INTERNAL_vl1_d212", - "node2" : "BUSCO_d212" + "node1" : "INTERNAL_vl1_BUSCO_bbs22_d212-d212", + "node2" : "BUSCO_bbs22_d212" }, { "node1" : "b123", - "node2" : "INTERNAL_vl1_b123" + "node2" : "INTERNAL_vl1_d123b-b123" }, { - "node1" : "INTERNAL_vl1_b123", + "node1" : "INTERNAL_vl1_d123b-b123", "node2" : "d123b" }, { "node1" : "b223", - "node2" : "INTERNAL_vl1_b223" + "node2" : "INTERNAL_vl1_d223b-b223" }, { - "node1" : "INTERNAL_vl1_b223", + "node1" : "INTERNAL_vl1_d223b-b223", "node2" : "d223b" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testLanesWithUnileg.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testLanesWithUnileg.json index 59ad4d04c..867fd5b4c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testLanesWithUnileg.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testLanesWithUnileg.json @@ -8,21 +8,21 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b1", + "id" : "INTERNAL_vl_dF1-dF2", "componentType" : "NODE", "fictitious" : true, - "x" : 25.0, - "y" : 24.0 + "x" : 125.0, + "y" : 44.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b1", + "id" : "INTERNAL_vl_db11-b1", "componentType" : "NODE", "fictitious" : true, - "x" : 225.0, + "x" : 25.0, "y" : 24.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_db12-b2", "componentType" : "NODE", "fictitious" : true, "x" : 75.0, @@ -30,19 +30,19 @@ "orientation" : "DOWN" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b2", + "id" : "INTERNAL_vl_db31-b1", "componentType" : "NODE", "fictitious" : true, - "x" : 175.0, - "y" : 149.0, - "orientation" : "DOWN" + "x" : 225.0, + "y" : 24.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_dF2", + "id" : "INTERNAL_vl_db32-b2", "componentType" : "NODE", "fictitious" : true, - "x" : 125.0, - "y" : 44.0 + "x" : 175.0, + "y" : 149.0, + "orientation" : "DOWN" }, { "type" : "SWITCH", "id" : "b1", @@ -251,7 +251,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs13", "db31", "INTERNAL_vl_b1" ] + "nodes" : [ "bbs13", "db31", "INTERNAL_vl_db31-b1" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -272,7 +272,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b1", "b1", "INTERNAL_vl_b1" ] + "nodes" : [ "INTERNAL_vl_db11-b1", "b1", "INTERNAL_vl_db31-b1" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -293,7 +293,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "db11", "INTERNAL_vl_b1" ] + "nodes" : [ "bbs11", "db11", "INTERNAL_vl_db11-b1" ] } ] } }, { @@ -339,7 +339,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs13", "db32", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs13", "db32", "INTERNAL_vl_db32-b2" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -360,7 +360,7 @@ "xSpan" : 50.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b2", "b2", "INTERNAL_vl_b2" ] + "nodes" : [ "INTERNAL_vl_db12-b2", "b2", "INTERNAL_vl_db32-b2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -381,7 +381,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "db12", "INTERNAL_vl_b2" ] + "nodes" : [ "bbs11", "db12", "INTERNAL_vl_db12-b2" ] } ] } }, { @@ -428,7 +428,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "dF1", "INTERNAL_vl_dF2" ] + "nodes" : [ "bbs12", "dF1", "INTERNAL_vl_dF1-dF2" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -449,7 +449,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "dF2", "INTERNAL_vl_dF2" ] + "nodes" : [ "bbs22", "dF2", "INTERNAL_vl_dF1-dF2" ] } ] } } ], @@ -473,33 +473,33 @@ "node2" : "bbs13" }, { "node1" : "db11", - "node2" : "INTERNAL_vl_b1" + "node2" : "INTERNAL_vl_db11-b1" }, { - "node1" : "INTERNAL_vl_b1", + "node1" : "INTERNAL_vl_db11-b1", "node2" : "b1" }, { "node1" : "db12", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_db12-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_db12-b2", "node2" : "b2" }, { "node1" : "dF1", - "node2" : "INTERNAL_vl_dF2" + "node2" : "INTERNAL_vl_dF1-dF2" }, { - "node1" : "INTERNAL_vl_dF2", + "node1" : "INTERNAL_vl_dF1-dF2", "node2" : "dF2" }, { "node1" : "b1", - "node2" : "INTERNAL_vl_b1" + "node2" : "INTERNAL_vl_db31-b1" }, { - "node1" : "INTERNAL_vl_b1", + "node1" : "INTERNAL_vl_db31-b1", "node2" : "db31" }, { "node1" : "b2", - "node2" : "INTERNAL_vl_b2" + "node2" : "INTERNAL_vl_db32-b2" }, { - "node1" : "INTERNAL_vl_b2", + "node1" : "INTERNAL_vl_db32-b2", "node2" : "db32" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOnBus.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOnBus.json index 131ccdaed..60e40053f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOnBus.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOnBus.json @@ -8,14 +8,14 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "BUSCO_l1", + "id" : "BUSCO_bbs_l1", "componentType" : "BUS_CONNECTION", "fictitious" : true, "x" : 50.0, "y" : 172.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_l1", + "id" : "INTERNAL_vl_BUSCO_bbs_l1-l1", "componentType" : "NODE", "fictitious" : true, "x" : 50.0, @@ -132,7 +132,7 @@ "xSpan" : 100.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "BUSCO_l1", "INTERNAL_vl_l1" ] + "nodes" : [ "bbs", "BUSCO_bbs_l1", "INTERNAL_vl_BUSCO_bbs_l1-l1" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -193,7 +193,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_l1", "b", "INTERNAL_vl_l2" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs_l1-l1", "b", "INTERNAL_vl_l2" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -256,7 +256,7 @@ "xSpan" : 50.0, "ySpan" : 80.0 }, - "nodes" : [ "INTERNAL_vl_l1", "INTERNAL_vl_l1" ] + "nodes" : [ "INTERNAL_vl_BUSCO_bbs_l1-l1", "INTERNAL_vl_l1" ] }, { "type" : "FEEDERPRIMARY", "cardinalities" : [ { @@ -285,15 +285,15 @@ } ], "edges" : [ { "node1" : "bbs", - "node2" : "BUSCO_l1" + "node2" : "BUSCO_bbs_l1" }, { - "node1" : "INTERNAL_vl_l1", + "node1" : "INTERNAL_vl_BUSCO_bbs_l1-l1", "node2" : "b" }, { - "node1" : "BUSCO_l1", - "node2" : "INTERNAL_vl_l1" + "node1" : "BUSCO_bbs_l1", + "node2" : "INTERNAL_vl_BUSCO_bbs_l1-l1" }, { - "node1" : "INTERNAL_vl_l1", + "node1" : "INTERNAL_vl_BUSCO_bbs_l1-l1", "node2" : "INTERNAL_vl_l1" }, { "node1" : "INTERNAL_vl_l1", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOrders.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOrders.json index 06443509f..957282967 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOrders.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testParallelFeedersOrders.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b", + "id" : "INTERNAL_vl_d-b", "componentType" : "NODE", "fictitious" : true, "x" : 50.0, @@ -157,7 +157,7 @@ "xSpan" : 100.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs", "d", "INTERNAL_vl_b" ] + "nodes" : [ "bbs", "d", "INTERNAL_vl_d-b" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -178,7 +178,7 @@ "xSpan" : 100.0, "ySpan" : 54.0 }, - "nodes" : [ "INTERNAL_vl_b", "b", "INTERNAL_vl_f" ] + "nodes" : [ "INTERNAL_vl_d-b", "b", "INTERNAL_vl_f" ] }, { "type" : "BODYPARALLEL", "cardinalities" : [ { @@ -340,9 +340,9 @@ "node2" : "b2" }, { "node1" : "d", - "node2" : "INTERNAL_vl_b" + "node2" : "INTERNAL_vl_d-b" }, { - "node1" : "INTERNAL_vl_b", + "node1" : "INTERNAL_vl_d-b", "node2" : "b" }, { "node1" : "INTERNAL_vl_f", diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/testSerialBlocksInternCells.json b/single-line-diagram/single-line-diagram-core/src/test/resources/testSerialBlocksInternCells.json index ebfd7ebc1..a50654ca2 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/testSerialBlocksInternCells.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/testSerialBlocksInternCells.json @@ -8,7 +8,7 @@ "y" : 80.0, "nodes" : [ { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b11", + "id" : "INTERNAL_vl_sd11-b11", "componentType" : "NODE", "fictitious" : true, "x" : 100.0, @@ -16,7 +16,7 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b12", + "id" : "INTERNAL_vl_sd12-b12", "componentType" : "NODE", "fictitious" : true, "x" : 200.0, @@ -24,14 +24,14 @@ "orientation" : "RIGHT" }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b21", + "id" : "INTERNAL_vl_sd21-b21", "componentType" : "NODE", "fictitious" : true, "x" : 25.0, "y" : 71.0 }, { "type" : "INTERNAL", - "id" : "INTERNAL_vl_b22", + "id" : "INTERNAL_vl_sd22-b22", "componentType" : "NODE", "fictitious" : true, "x" : 225.0, @@ -247,7 +247,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs12", "sd12", "INTERNAL_vl_b12" ] + "nodes" : [ "bbs12", "sd12", "INTERNAL_vl_sd12-b12" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -268,7 +268,7 @@ "xSpan" : 100.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b11", "b11", "b12", "INTERNAL_vl_b12" ] + "nodes" : [ "INTERNAL_vl_sd11-b11", "b11", "b12", "INTERNAL_vl_sd12-b12" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -289,7 +289,7 @@ "xSpan" : 0.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "sd11", "INTERNAL_vl_b11" ] + "nodes" : [ "bbs11", "sd11", "INTERNAL_vl_sd11-b11" ] } ] } }, { @@ -335,7 +335,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs22", "sd22", "INTERNAL_vl_b22" ] + "nodes" : [ "bbs22", "sd22", "INTERNAL_vl_sd22-b22" ] }, { "type" : "BODYPRIMARY", "cardinalities" : [ { @@ -356,7 +356,7 @@ "xSpan" : 100.0, "ySpan" : 40.0 }, - "nodes" : [ "INTERNAL_vl_b21", "b21", "b22", "INTERNAL_vl_b22" ] + "nodes" : [ "INTERNAL_vl_sd21-b21", "b21", "b22", "INTERNAL_vl_sd22-b22" ] }, { "type" : "LEGPRIMARY", "cardinalities" : [ { @@ -377,7 +377,7 @@ "xSpan" : 50.0, "ySpan" : 0.0 }, - "nodes" : [ "bbs11", "sd21", "INTERNAL_vl_b21" ] + "nodes" : [ "bbs11", "sd21", "INTERNAL_vl_sd21-b21" ] } ] } } ], @@ -401,27 +401,27 @@ "node2" : "sd22" }, { "node1" : "b11", - "node2" : "INTERNAL_vl_b11" + "node2" : "INTERNAL_vl_sd11-b11" }, { - "node1" : "INTERNAL_vl_b11", + "node1" : "INTERNAL_vl_sd11-b11", "node2" : "sd11" }, { "node1" : "b21", - "node2" : "INTERNAL_vl_b21" + "node2" : "INTERNAL_vl_sd21-b21" }, { - "node1" : "INTERNAL_vl_b21", + "node1" : "INTERNAL_vl_sd21-b21", "node2" : "sd21" }, { "node1" : "b12", - "node2" : "INTERNAL_vl_b12" + "node2" : "INTERNAL_vl_sd12-b12" }, { - "node1" : "INTERNAL_vl_b12", + "node1" : "INTERNAL_vl_sd12-b12", "node2" : "sd12" }, { "node1" : "b22", - "node2" : "INTERNAL_vl_b22" + "node2" : "INTERNAL_vl_sd22-b22" }, { - "node1" : "INTERNAL_vl_b22", + "node1" : "INTERNAL_vl_sd22-b22", "node2" : "sd22" } ], "multitermNodes" : [ ], diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg index 66562abab..35a9affba 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg @@ -147,10 +147,10 @@ bbs1 - + - + @@ -173,7 +173,7 @@ - + @@ -191,10 +191,10 @@ - + - + @@ -217,7 +217,7 @@ - + @@ -232,10 +232,10 @@ - + - + @@ -258,7 +258,7 @@ - + @@ -280,10 +280,10 @@ bbs2 - + - + @@ -306,7 +306,7 @@ - + @@ -321,10 +321,10 @@ - + - + @@ -347,7 +347,7 @@ - + @@ -369,10 +369,10 @@ bbs3 - + - + @@ -395,7 +395,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json index 8cea10920..4c7d1c4e5 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json @@ -175,21 +175,7 @@ "styleClass" : "sld-breaker" } ], "nodes" : [ { - "id" : "idINTERNAL_95_vl1_95_btrf17", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf16", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf15", + "id" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -209,50 +195,22 @@ "positionName" : "S_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_btrf14", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf13", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_dtrct11", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf12", + "id" : "iddtrct21", "vid" : "vl1", - "componentType" : "NODE", + "componentType" : "BREAKER", "open" : false, "vlabel" : false, + "equipmentId" : "dtrct21", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_btrf11", + "id" : "idINTERNAL_95_vl1_95_trf1_95_ONE", "vid" : "vl1", "componentType" : "NODE", "open" : false, "vlabel" : false, "labels" : [ ] }, { - "id" : "iddtrct21", - "vid" : "vl1", - "componentType" : "BREAKER", - "open" : false, - "vlabel" : false, - "equipmentId" : "dtrct21", - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_trf1_95_ONE", + "id" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -343,6 +301,13 @@ "open" : false, "vlabel" : false, "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_trf5_95_ONE", "vid" : "vl1", @@ -366,13 +331,6 @@ "vlabel" : false, "equipmentId" : "btrf12", "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_btrf18", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] }, { "id" : "idbbs4", "vid" : "vl1", @@ -400,6 +358,13 @@ "vlabel" : false, "equipmentId" : "bgen2", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idgen1", "vid" : "vl1", @@ -424,6 +389,13 @@ "id" : "gen2_S_LABEL", "positionName" : "S_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idbbs1", "vid" : "vl1", @@ -457,6 +429,20 @@ "id" : "bbs3_NW_LABEL", "positionName" : "NW_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddtrf11", "vid" : "vl1", @@ -579,6 +565,13 @@ "vlabel" : false, "equipmentId" : "dtrf13", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddtrf12", "vid" : "vl1", @@ -587,6 +580,20 @@ "vlabel" : false, "equipmentId" : "dtrf12", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idtrf6", "vid" : "vl1", @@ -628,14 +635,7 @@ "equipmentId" : "dgen2", "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_bload2", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_bload1", + "id" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -667,6 +667,13 @@ "id" : "trf7_TWO_S_LABEL", "positionName" : "S_LABEL" } ] + }, { + "id" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idINTERNAL_95_vl1_95_gen1", "vid" : "vl1", @@ -710,6 +717,13 @@ "vlabel" : false, "equipmentId" : "dsect22", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dload2_45_bload2", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "iddtrct11", "vid" : "vl1", @@ -718,6 +732,13 @@ "vlabel" : false, "equipmentId" : "dtrct11", "labels" : [ ] + }, { + "id" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", + "vid" : "vl1", + "componentType" : "NODE", + "open" : false, + "vlabel" : false, + "labels" : [ ] }, { "id" : "idload1", "vid" : "vl1", @@ -772,21 +793,14 @@ "positionName" : "N_LABEL" } ] }, { - "id" : "idINTERNAL_95_vl1_95_dtrct21", - "vid" : "vl1", - "componentType" : "NODE", - "open" : false, - "vlabel" : false, - "labels" : [ ] - }, { - "id" : "idINTERNAL_95_vl1_95_bgen1", + "id" : "idINTERNAL_95_vl1_95_dload1_45_bload1", "vid" : "vl1", "componentType" : "NODE", "open" : false, "vlabel" : false, "labels" : [ ] }, { - "id" : "idINTERNAL_95_vl1_95_bgen2", + "id" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", "vid" : "vl1", "componentType" : "NODE", "open" : false, @@ -836,9 +850,9 @@ } ] } ], "wires" : [ { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf13_95_btrf13", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf13", - "nodeId2" : "idbtrf13", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf15_45_btrf15_95_btrf15", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "nodeId2" : "idbtrf15", "straight" : false, "snakeLine" : false }, { @@ -854,15 +868,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf11_95_INTERNAL_95_vl1_95_btrf11", - "nodeId1" : "iddtrf11", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf11", + "id" : "_95_vl1_95_dtrf12_95_INTERNAL_95_vl1_95_dtrf12_45_btrf12", + "nodeId1" : "iddtrf12", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bgen1_95_bgen1", - "nodeId1" : "idINTERNAL_95_vl1_95_bgen1", - "nodeId2" : "idbgen1", + "id" : "_95_vl1_95_dgen1_95_INTERNAL_95_vl1_95_dgen1_45_bgen1", + "nodeId1" : "iddgen1", + "nodeId2" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dsect21_95_INTERNAL_95_vl1_95_dsect21_45_dtrct21", + "nodeId1" : "iddsect21", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", "straight" : false, "snakeLine" : false }, { @@ -872,9 +892,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrct21_95_INTERNAL_95_vl1_95_dtrct21", - "nodeId1" : "iddtrct21", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct21", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dgen2_45_bgen2_95_bgen2", + "nodeId1" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", + "nodeId2" : "idbgen2", "straight" : false, "snakeLine" : false }, { @@ -890,15 +910,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf12_95_INTERNAL_95_vl1_95_btrf12", - "nodeId1" : "iddtrf12", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf12", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf16_95_btrf16", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf16", - "nodeId2" : "idbtrf16", + "id" : "_95_vl1_95_dtrct21_95_INTERNAL_95_vl1_95_dsect22_45_dtrct21", + "nodeId1" : "iddtrct21", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", "straight" : false, "snakeLine" : false }, { @@ -919,6 +933,12 @@ "nodeId2" : "iddtrf13", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf16_95_INTERNAL_95_vl1_95_dtrf16_45_btrf16", + "nodeId1" : "iddtrf16", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_btrf17_95_trf7", "nodeId1" : "idbtrf17", @@ -932,33 +952,27 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct11_95_dsect12", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct11", - "nodeId2" : "iddsect12", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dtrf13_95_INTERNAL_95_vl1_95_btrf13", - "nodeId1" : "iddtrf13", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf13", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dgen1_45_bgen1_95_bgen1", + "nodeId1" : "idINTERNAL_95_vl1_95_dgen1_45_bgen1", + "nodeId2" : "idbgen1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf18_95_INTERNAL_95_vl1_95_btrf18", - "nodeId1" : "iddtrf18", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf18", + "id" : "_95_vl1_95_trf8_95_THREE_95_trf8", + "nodeId1" : "idtrf8_95_THREE", + "nodeId2" : "idtrf8", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf14_95_btrf14", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf14", - "nodeId2" : "idbtrf14", + "id" : "_95_vl1_95_dsect11_95_INTERNAL_95_vl1_95_dsect11_45_dtrct11", + "nodeId1" : "iddsect11", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_trf8_95_THREE_95_trf8", - "nodeId1" : "idtrf8_95_THREE", - "nodeId2" : "idtrf8", + "id" : "_95_vl1_95_dtrf13_95_INTERNAL_95_vl1_95_dtrf13_45_btrf13", + "nodeId1" : "iddtrf13", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", "straight" : false, "snakeLine" : false }, { @@ -974,9 +988,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dload2_95_INTERNAL_95_vl1_95_bload2", - "nodeId1" : "iddload2", - "nodeId2" : "idINTERNAL_95_vl1_95_bload2", + "id" : "_95_vl1_95_dgen2_95_INTERNAL_95_vl1_95_dgen2_45_bgen2", + "nodeId1" : "iddgen2", + "nodeId2" : "idINTERNAL_95_vl1_95_dgen2_45_bgen2", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf17_95_INTERNAL_95_vl1_95_dtrf17_45_btrf17", + "nodeId1" : "iddtrf17", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", "straight" : false, "snakeLine" : false }, { @@ -986,9 +1006,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf17_95_btrf17", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf17", - "nodeId2" : "idbtrf17", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf12_45_btrf12_95_btrf12", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf12_45_btrf12", + "nodeId2" : "idbtrf12", "straight" : false, "snakeLine" : false }, { @@ -998,21 +1018,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_bbs3_95_dgen1", - "nodeId1" : "idbbs3", - "nodeId2" : "iddgen1", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf18_45_btrf18_95_btrf18", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", + "nodeId2" : "idbtrf18", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrct11_95_INTERNAL_95_vl1_95_dtrct11", - "nodeId1" : "iddtrct11", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct11", + "id" : "_95_vl1_95_dload1_95_INTERNAL_95_vl1_95_dload1_45_bload1", + "nodeId1" : "iddload1", + "nodeId2" : "idINTERNAL_95_vl1_95_dload1_45_bload1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bload2_95_bload2", - "nodeId1" : "idINTERNAL_95_vl1_95_bload2", - "nodeId2" : "idbload2", + "id" : "_95_vl1_95_bbs3_95_dgen1", + "nodeId1" : "idbbs3", + "nodeId2" : "iddgen1", "straight" : false, "snakeLine" : false }, { @@ -1022,15 +1042,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_gen1_95_bgen1", - "nodeId1" : "idINTERNAL_95_vl1_95_gen1", - "nodeId2" : "idbgen1", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf14_45_btrf14_95_btrf14", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", + "nodeId2" : "idbtrf14", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf15_95_INTERNAL_95_vl1_95_btrf15", - "nodeId1" : "iddtrf15", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf15", + "id" : "_95_vl1_95_dtrct11_95_INTERNAL_95_vl1_95_dsect12_45_dtrct11", + "nodeId1" : "iddtrct11", + "nodeId2" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_gen1_95_bgen1", + "nodeId1" : "idINTERNAL_95_vl1_95_gen1", + "nodeId2" : "idbgen1", "straight" : false, "snakeLine" : false }, { @@ -1039,12 +1065,24 @@ "nodeId2" : "idtrf1_95_ONE", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf16_45_btrf16_95_btrf16", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf16_45_btrf16", + "nodeId2" : "idbtrf16", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_bbs2_95_dload2", "nodeId1" : "idbbs2", "nodeId2" : "iddload2", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect12_45_dtrct11_95_dsect12", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect12_45_dtrct11", + "nodeId2" : "iddsect12", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_bbs1_95_dtrf16", "nodeId1" : "idbbs1", @@ -1057,24 +1095,6 @@ "nodeId2" : "iddtrf15", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_dtrf16_95_INTERNAL_95_vl1_95_btrf16", - "nodeId1" : "iddtrf16", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf16", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dsect11_95_INTERNAL_95_vl1_95_dtrct11", - "nodeId1" : "iddsect11", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct11", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct21_95_dsect22", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct21", - "nodeId2" : "iddsect22", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_bbs1_95_dtrf11", "nodeId1" : "idbbs1", @@ -1106,21 +1126,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf17_95_INTERNAL_95_vl1_95_btrf17", - "nodeId1" : "iddtrf17", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf17", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_dgen2_95_INTERNAL_95_vl1_95_bgen2", - "nodeId1" : "iddgen2", - "nodeId2" : "idINTERNAL_95_vl1_95_bgen2", + "id" : "_95_vl1_95_dtrf14_95_INTERNAL_95_vl1_95_dtrf14_45_btrf14", + "nodeId1" : "iddtrf14", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf14_45_btrf14", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct11_95_dtrct11", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct11", - "nodeId2" : "iddtrct11", + "id" : "_95_vl1_95_dtrf18_95_INTERNAL_95_vl1_95_dtrf18_45_btrf18", + "nodeId1" : "iddtrf18", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf18_45_btrf18", "straight" : false, "snakeLine" : false }, { @@ -1129,12 +1143,6 @@ "nodeId2" : "idtrf8", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf11_95_btrf11", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf11", - "nodeId2" : "idbtrf11", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_INTERNAL_95_vl1_95_trf3_95_ONE_95_trf3_95_ONE", "nodeId1" : "idINTERNAL_95_vl1_95_trf3_95_ONE", @@ -1142,27 +1150,21 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dload1_95_INTERNAL_95_vl1_95_bload1", - "nodeId1" : "iddload1", - "nodeId2" : "idINTERNAL_95_vl1_95_bload1", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bload1_95_bload1", - "nodeId1" : "idINTERNAL_95_vl1_95_bload1", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dload1_45_bload1_95_bload1", + "nodeId1" : "idINTERNAL_95_vl1_95_dload1_45_bload1", "nodeId2" : "idbload1", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf12_95_btrf12", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf12", - "nodeId2" : "idbtrf12", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dload2_45_bload2_95_bload2", + "nodeId1" : "idINTERNAL_95_vl1_95_dload2_45_bload2", + "nodeId2" : "idbload2", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_bgen2_95_bgen2", - "nodeId1" : "idINTERNAL_95_vl1_95_bgen2", - "nodeId2" : "idbgen2", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect21_45_dtrct21_95_dtrct21", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect21_45_dtrct21", + "nodeId2" : "iddtrct21", "straight" : false, "snakeLine" : false }, { @@ -1171,6 +1173,18 @@ "nodeId2" : "idINTERNAL_95_vl1_95_trf2_95_ONE", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect11_45_dtrct11_95_dtrct11", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect11_45_dtrct11", + "nodeId2" : "iddtrct11", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_dload2_95_INTERNAL_95_vl1_95_dload2_45_bload2", + "nodeId1" : "iddload2", + "nodeId2" : "idINTERNAL_95_vl1_95_dload2_45_bload2", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_trf7_95_TWO_95_trf7", "nodeId1" : "idtrf7_95_TWO", @@ -1195,12 +1209,6 @@ "nodeId2" : "iddsect21", "straight" : false, "snakeLine" : false - }, { - "id" : "_95_vl1_95_dgen1_95_INTERNAL_95_vl1_95_bgen1", - "nodeId1" : "iddgen1", - "nodeId2" : "idINTERNAL_95_vl1_95_bgen1", - "straight" : false, - "snakeLine" : false }, { "id" : "_95_vl1_95_dsect12_95_bbs2", "nodeId1" : "iddsect12", @@ -1208,9 +1216,9 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf18_95_btrf18", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf18", - "nodeId2" : "idbtrf18", + "id" : "_95_vl1_95_dtrf11_95_INTERNAL_95_vl1_95_dtrf11_45_btrf11", + "nodeId1" : "iddtrf11", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", "straight" : false, "snakeLine" : false }, { @@ -1232,9 +1240,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dtrf14_95_INTERNAL_95_vl1_95_btrf14", - "nodeId1" : "iddtrf14", - "nodeId2" : "idINTERNAL_95_vl1_95_btrf14", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dsect22_45_dtrct21_95_dsect22", + "nodeId1" : "idINTERNAL_95_vl1_95_dsect22_45_dtrct21", + "nodeId2" : "iddsect22", + "straight" : false, + "snakeLine" : false + }, { + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf13_45_btrf13_95_btrf13", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf13_45_btrf13", + "nodeId2" : "idbtrf13", "straight" : false, "snakeLine" : false }, { @@ -1250,21 +1264,15 @@ "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_dsect21_95_INTERNAL_95_vl1_95_dtrct21", - "nodeId1" : "iddsect21", - "nodeId2" : "idINTERNAL_95_vl1_95_dtrct21", - "straight" : false, - "snakeLine" : false - }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrct21_95_dtrct21", - "nodeId1" : "idINTERNAL_95_vl1_95_dtrct21", - "nodeId2" : "iddtrct21", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf17_45_btrf17_95_btrf17", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf17_45_btrf17", + "nodeId2" : "idbtrf17", "straight" : false, "snakeLine" : false }, { - "id" : "_95_vl1_95_INTERNAL_95_vl1_95_btrf15_95_btrf15", - "nodeId1" : "idINTERNAL_95_vl1_95_btrf15", - "nodeId2" : "idbtrf15", + "id" : "_95_vl1_95_INTERNAL_95_vl1_95_dtrf11_45_btrf11_95_btrf11", + "nodeId1" : "idINTERNAL_95_vl1_95_dtrf11_45_btrf11", + "nodeId2" : "idbtrf11", "straight" : false, "snakeLine" : false }, { @@ -1279,6 +1287,12 @@ "nodeId2" : "idtrf8", "straight" : false, "snakeLine" : false + }, { + "id" : "_95_vl1_95_dtrf15_95_INTERNAL_95_vl1_95_dtrf15_45_btrf15", + "nodeId1" : "iddtrf15", + "nodeId2" : "idINTERNAL_95_vl1_95_dtrf15_45_btrf15", + "straight" : false, + "snakeLine" : false }, { "id" : "_95_vl1_95_gen2_95_INTERNAL_95_vl1_95_gen2", "nodeId1" : "idgen2",