diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index e939de6f56..a72dedb573 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -179,12 +179,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err elkGraph := &ELKGraph{ ID: "", LayoutOptions: &elkOpts{ + ForceNodeModelOrder: true, Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, EdgeNode: edge_node_spacing, HierarchyHandling: "INCLUDE_CHILDREN", FixedAlignment: "BALANCED", - ConsiderModelOrder: "NODES_AND_EDGES", CycleBreakingStrategy: "GREEDY_MODEL_ORDER", NodeSizeConstraints: "MINIMUM_SIZE", ContentAlignment: "H_CENTER V_CENTER", diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index b5a1bf653b..bd747a1b1e 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -7,10 +7,10 @@ "id": "a", "type": "rectangle", "pos": { - "x": 184, + "x": 56, "y": 373 }, - "width": 481, + "width": 501, "height": 527, "opacity": 1, "strokeDash": 0, @@ -48,7 +48,7 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 234, + "x": 106, "y": 423 }, "width": 151, @@ -89,7 +89,7 @@ "id": "a.k.t", "type": "rectangle", "pos": { - "x": 284, + "x": 156, "y": 473 }, "width": 51, @@ -130,7 +130,7 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 257, + "x": 214, "y": 679 }, "width": 293, @@ -171,7 +171,7 @@ "id": "a.f.i", "type": "rectangle", "pos": { - "x": 307, + "x": 264, "y": 729 }, "width": 49, @@ -212,7 +212,7 @@ "id": "a.f.g", "type": "rectangle", "pos": { - "x": 376, + "x": 333, "y": 729 }, "width": 54, @@ -253,8 +253,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 288, - "y": 1401 + "x": 383, + "y": 1481 }, "width": 424, "height": 271, @@ -294,8 +294,8 @@ "id": "s.n", "type": "rectangle", "pos": { - "x": 338, - "y": 1453 + "x": 433, + "y": 1533 }, "width": 151, "height": 166, @@ -335,7 +335,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 12, + "x": 577, "y": 734 }, "width": 152, @@ -376,7 +376,7 @@ "id": "k.s", "type": "rectangle", "pos": { - "x": 62, + "x": 627, "y": 784 }, "width": 52, @@ -417,11 +417,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 276, - "y": 1040 + "x": 510, + "y": 990 }, "width": 397, - "height": 271, + "height": 401, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -458,8 +458,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 326, - "y": 1095 + "x": 560, + "y": 1175 }, "width": 54, "height": 66, @@ -499,7 +499,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 299, + "x": 340, "y": 12 }, "width": 252, @@ -540,7 +540,7 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 349, + "x": 390, "y": 62 }, "width": 152, @@ -581,7 +581,7 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 399, + "x": 440, "y": 112 }, "width": 52, @@ -622,7 +622,7 @@ "id": "a.f.j", "type": "rectangle", "pos": { - "x": 450, + "x": 407, "y": 729 }, "width": 50, @@ -663,8 +663,8 @@ "id": "u.s", "type": "rectangle", "pos": { - "x": 400, - "y": 1095 + "x": 634, + "y": 1175 }, "width": 150, "height": 166, @@ -704,8 +704,8 @@ "id": "u.s.j", "type": "rectangle", "pos": { - "x": 450, - "y": 1145 + "x": 684, + "y": 1225 }, "width": 50, "height": 66, @@ -745,8 +745,8 @@ "id": "u.c", "type": "rectangle", "pos": { - "x": 570, - "y": 1195 + "x": 804, + "y": 1275 }, "width": 53, "height": 66, @@ -786,8 +786,8 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 509, - "y": 1456 + "x": 604, + "y": 1536 }, "width": 153, "height": 166, @@ -827,8 +827,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 559, - "y": 1506 + "x": 654, + "y": 1586 }, "width": 53, "height": 66, @@ -868,8 +868,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 388, - "y": 1503 + "x": 483, + "y": 1583 }, "width": 51, "height": 66, @@ -909,8 +909,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 338, - "y": 1752 + "x": 433, + "y": 1832 }, "width": 151, "height": 166, @@ -950,8 +950,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 388, - "y": 1802 + "x": 483, + "y": 1882 }, "width": 51, "height": 66, @@ -991,7 +991,7 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 466, + "x": 277, "y": 428 }, "width": 149, @@ -1032,7 +1032,7 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 516, + "x": 327, "y": 478 }, "width": 49, @@ -1096,19 +1096,19 @@ "labelPercentage": 0, "route": [ { - "x": 309.5, + "x": 182, "y": 539 }, { - "x": 309.5, + "x": 182, "y": 634 }, { - "x": 331.5, + "x": 288.5, "y": 634 }, { - "x": 331.5, + "x": 288.5, "y": 729 } ], @@ -1142,28 +1142,20 @@ "labelPercentage": 0, "route": [ { - "x": 403, + "x": 360, "y": 795 }, { - "x": 403, - "y": 945 - }, - { - "x": 235, - "y": 945 + "x": 360, + "y": 1436 }, { - "x": 235, - "y": 1356 + "x": 509.25, + "y": 1436 }, { - "x": 413.75, - "y": 1356 - }, - { - "x": 413.75, - "y": 1454 + "x": 509.25, + "y": 1534 } ], "animated": false, @@ -1196,20 +1188,20 @@ "labelPercentage": 0, "route": [ { - "x": 88, + "x": 653, "y": 850 }, { - "x": 88, - "y": 995 + "x": 653, + "y": 1080 }, { - "x": 353, - "y": 995 + "x": 587, + "y": 1080 }, { - "x": 353, - "y": 1095 + "x": 587, + "y": 1175 } ], "animated": false, @@ -1242,19 +1234,19 @@ "labelPercentage": 0, "route": [ { - "x": 425, + "x": 466.5, "y": 178 }, { - "x": 425, + "x": 466.5, "y": 634 }, { - "x": 403, + "x": 360, "y": 634 }, { - "x": 403, + "x": 360, "y": 729 } ], @@ -1288,12 +1280,20 @@ "labelPercentage": 0, "route": [ { - "x": 475, + "x": 432, "y": 795 }, { - "x": 475, - "y": 1145 + "x": 432, + "y": 1130 + }, + { + "x": 709, + "y": 1130 + }, + { + "x": 709, + "y": 1225 } ], "animated": false, @@ -1326,12 +1326,20 @@ "labelPercentage": 0, "route": [ { - "x": 596.5, - "y": 1261 + "x": 830.5, + "y": 1341 + }, + { + "x": 830.5, + "y": 1436 + }, + { + "x": 681.25, + "y": 1436 }, { - "x": 596.5, - "y": 1506 + "x": 681.25, + "y": 1586 } ], "animated": false, @@ -1364,12 +1372,12 @@ "labelPercentage": 0, "route": [ { - "x": 413.75, - "y": 1619 + "x": 509.25, + "y": 1699 }, { - "x": 413.75, - "y": 1802 + "x": 509.25, + "y": 1882 } ], "animated": false, @@ -1402,27 +1410,27 @@ "labelPercentage": 0, "route": [ { - "x": 413.75, - "y": 1868 + "x": 509.25, + "y": 1948 }, { - "x": 413.75, - "y": 1963 + "x": 509.25, + "y": 2043 }, { - "x": 814.25, - "y": 1963 + "x": 16.5, + "y": 2043 }, { - "x": 814.25, + "x": 16.5, "y": 328 }, { - "x": 540.5, + "x": 352, "y": 328 }, { - "x": 540.5, + "x": 352, "y": 478 } ], diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 961dbc3ed9..a04ba7871c 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1633559639 .fill-N1{fill:#0A0F25;} + .d2-1633559639 .fill-N2{fill:#676C7E;} + .d2-1633559639 .fill-N3{fill:#9499AB;} + .d2-1633559639 .fill-N4{fill:#CFD2DD;} + .d2-1633559639 .fill-N5{fill:#DEE1EB;} + .d2-1633559639 .fill-N6{fill:#EEF1F8;} + .d2-1633559639 .fill-N7{fill:#FFFFFF;} + .d2-1633559639 .fill-B1{fill:#0D32B2;} + .d2-1633559639 .fill-B2{fill:#0D32B2;} + .d2-1633559639 .fill-B3{fill:#E3E9FD;} + .d2-1633559639 .fill-B4{fill:#E3E9FD;} + .d2-1633559639 .fill-B5{fill:#EDF0FD;} + .d2-1633559639 .fill-B6{fill:#F7F8FE;} + .d2-1633559639 .fill-AA2{fill:#4A6FF3;} + .d2-1633559639 .fill-AA4{fill:#EDF0FD;} + .d2-1633559639 .fill-AA5{fill:#F7F8FE;} + .d2-1633559639 .fill-AB4{fill:#EDF0FD;} + .d2-1633559639 .fill-AB5{fill:#F7F8FE;} + .d2-1633559639 .stroke-N1{stroke:#0A0F25;} + .d2-1633559639 .stroke-N2{stroke:#676C7E;} + .d2-1633559639 .stroke-N3{stroke:#9499AB;} + .d2-1633559639 .stroke-N4{stroke:#CFD2DD;} + .d2-1633559639 .stroke-N5{stroke:#DEE1EB;} + .d2-1633559639 .stroke-N6{stroke:#EEF1F8;} + .d2-1633559639 .stroke-N7{stroke:#FFFFFF;} + .d2-1633559639 .stroke-B1{stroke:#0D32B2;} + .d2-1633559639 .stroke-B2{stroke:#0D32B2;} + .d2-1633559639 .stroke-B3{stroke:#E3E9FD;} + .d2-1633559639 .stroke-B4{stroke:#E3E9FD;} + .d2-1633559639 .stroke-B5{stroke:#EDF0FD;} + .d2-1633559639 .stroke-B6{stroke:#F7F8FE;} + .d2-1633559639 .stroke-AA2{stroke:#4A6FF3;} + .d2-1633559639 .stroke-AA4{stroke:#EDF0FD;} + .d2-1633559639 .stroke-AA5{stroke:#F7F8FE;} + .d2-1633559639 .stroke-AB4{stroke:#EDF0FD;} + .d2-1633559639 .stroke-AB5{stroke:#F7F8FE;} + .d2-1633559639 .background-color-N1{background-color:#0A0F25;} + .d2-1633559639 .background-color-N2{background-color:#676C7E;} + .d2-1633559639 .background-color-N3{background-color:#9499AB;} + .d2-1633559639 .background-color-N4{background-color:#CFD2DD;} + .d2-1633559639 .background-color-N5{background-color:#DEE1EB;} + .d2-1633559639 .background-color-N6{background-color:#EEF1F8;} + .d2-1633559639 .background-color-N7{background-color:#FFFFFF;} + .d2-1633559639 .background-color-B1{background-color:#0D32B2;} + .d2-1633559639 .background-color-B2{background-color:#0D32B2;} + .d2-1633559639 .background-color-B3{background-color:#E3E9FD;} + .d2-1633559639 .background-color-B4{background-color:#E3E9FD;} + .d2-1633559639 .background-color-B5{background-color:#EDF0FD;} + .d2-1633559639 .background-color-B6{background-color:#F7F8FE;} + .d2-1633559639 .background-color-AA2{background-color:#4A6FF3;} + .d2-1633559639 .background-color-AA4{background-color:#EDF0FD;} + .d2-1633559639 .background-color-AA5{background-color:#F7F8FE;} + .d2-1633559639 .background-color-AB4{background-color:#EDF0FD;} + .d2-1633559639 .background-color-AB5{background-color:#F7F8FE;} + .d2-1633559639 .color-N1{color:#0A0F25;} + .d2-1633559639 .color-N2{color:#676C7E;} + .d2-1633559639 .color-N3{color:#9499AB;} + .d2-1633559639 .color-N4{color:#CFD2DD;} + .d2-1633559639 .color-N5{color:#DEE1EB;} + .d2-1633559639 .color-N6{color:#EEF1F8;} + .d2-1633559639 .color-N7{color:#FFFFFF;} + .d2-1633559639 .color-B1{color:#0D32B2;} + .d2-1633559639 .color-B2{color:#0D32B2;} + .d2-1633559639 .color-B3{color:#E3E9FD;} + .d2-1633559639 .color-B4{color:#E3E9FD;} + .d2-1633559639 .color-B5{color:#EDF0FD;} + .d2-1633559639 .color-B6{color:#F7F8FE;} + .d2-1633559639 .color-AA2{color:#4A6FF3;} + .d2-1633559639 .color-AA4{color:#EDF0FD;} + .d2-1633559639 .color-AA5{color:#F7F8FE;} + .d2-1633559639 .color-AB4{color:#EDF0FD;} + .d2-1633559639 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsczrgtigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json index 2b0f6e2dbc..d3302483b3 100644 --- a/e2etests/testdata/regression/elk_order/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json @@ -47,7 +47,7 @@ "id": "queue.M0", "type": "rectangle", "pos": { - "x": 318, + "x": 62, "y": 195 }, "width": 65, @@ -88,7 +88,7 @@ "id": "queue.M1", "type": "rectangle", "pos": { - "x": 62, + "x": 147, "y": 195 }, "width": 65, @@ -129,7 +129,7 @@ "id": "queue.M2", "type": "rectangle", "pos": { - "x": 403, + "x": 232, "y": 195 }, "width": 65, @@ -170,7 +170,7 @@ "id": "queue.M3", "type": "rectangle", "pos": { - "x": 147, + "x": 317, "y": 195 }, "width": 65, @@ -211,7 +211,7 @@ "id": "queue.M4", "type": "rectangle", "pos": { - "x": 232, + "x": 402, "y": 195 }, "width": 66, @@ -334,7 +334,7 @@ "id": "m0_desc", "type": "text", "pos": { - "x": 270, + "x": 41, "y": 36 }, "width": 106, @@ -374,7 +374,7 @@ "id": "m2_desc", "type": "text", "pos": { - "x": 396, + "x": 244, "y": 36 }, "width": 41, @@ -414,7 +414,7 @@ "id": "m5_desc", "type": "text", "pos": { - "x": 457, + "x": 456, "y": 36 }, "width": 90, @@ -454,7 +454,7 @@ "id": "m6_desc", "type": "text", "pos": { - "x": 567, + "x": 566, "y": 12 }, "width": 140, @@ -517,11 +517,11 @@ "labelPercentage": 0, "route": [ { - "x": 350.5, + "x": 94.5, "y": 60 }, { - "x": 350.5, + "x": 94.5, "y": 195 } ], @@ -555,19 +555,11 @@ "labelPercentage": 0, "route": [ { - "x": 416.5, + "x": 264.5, "y": 60 }, { - "x": 416.5, - "y": 100 - }, - { - "x": 435.5, - "y": 100 - }, - { - "x": 435.5, + "x": 264.5, "y": 195 } ], diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index be307cd676..94e3b4b9e6 100644 --- a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

Oldest message

-

Offset

-

Last message

-

Next message will be
+

Oldest message

+

Offset

+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 - - - - - - +
M0M1M2M3M4M5M6 + + + + + - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json index 91714c1cd0..62fd352854 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json @@ -440,19 +440,11 @@ "labelPercentage": 0, "route": [ { - "x": 274.5, + "x": 482.29998779296875, "y": 178 }, { - "x": 274.5, - "y": 369 - }, - { - "x": 427.8999938964844, - "y": 369 - }, - { - "x": 427.8999938964844, + "x": 482.29998779296875, "y": 409 } ], @@ -486,11 +478,11 @@ "labelPercentage": 0, "route": [ { - "x": 482.29998779296875, + "x": 536.7000122070312, "y": 178 }, { - "x": 482.29998779296875, + "x": 536.7000122070312, "y": 409 } ], @@ -524,11 +516,19 @@ "labelPercentage": 0, "route": [ { - "x": 536.7000122070312, + "x": 741.5, "y": 178 }, { - "x": 536.7000122070312, + "x": 741.5, + "y": 369 + }, + { + "x": 591.0999755859375, + "y": 369 + }, + { + "x": 591.0999755859375, "y": 409 } ], @@ -562,19 +562,19 @@ "labelPercentage": 0, "route": [ { - "x": 735.7000122070312, + "x": 282, "y": 178 }, { - "x": 735.7000122070312, + "x": 282, "y": 369 }, { - "x": 591.0999755859375, + "x": 427.8999938964844, "y": 369 }, { - "x": 591.0999755859375, + "x": 427.8999938964844, "y": 409 } ], diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg index 6920ff8014..4c95ad8b3b 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + .d2-4011850205 .fill-N1{fill:#0A0F25;} + .d2-4011850205 .fill-N2{fill:#676C7E;} + .d2-4011850205 .fill-N3{fill:#9499AB;} + .d2-4011850205 .fill-N4{fill:#CFD2DD;} + .d2-4011850205 .fill-N5{fill:#DEE1EB;} + .d2-4011850205 .fill-N6{fill:#EEF1F8;} + .d2-4011850205 .fill-N7{fill:#FFFFFF;} + .d2-4011850205 .fill-B1{fill:#0D32B2;} + .d2-4011850205 .fill-B2{fill:#0D32B2;} + .d2-4011850205 .fill-B3{fill:#E3E9FD;} + .d2-4011850205 .fill-B4{fill:#E3E9FD;} + .d2-4011850205 .fill-B5{fill:#EDF0FD;} + .d2-4011850205 .fill-B6{fill:#F7F8FE;} + .d2-4011850205 .fill-AA2{fill:#4A6FF3;} + .d2-4011850205 .fill-AA4{fill:#EDF0FD;} + .d2-4011850205 .fill-AA5{fill:#F7F8FE;} + .d2-4011850205 .fill-AB4{fill:#EDF0FD;} + .d2-4011850205 .fill-AB5{fill:#F7F8FE;} + .d2-4011850205 .stroke-N1{stroke:#0A0F25;} + .d2-4011850205 .stroke-N2{stroke:#676C7E;} + .d2-4011850205 .stroke-N3{stroke:#9499AB;} + .d2-4011850205 .stroke-N4{stroke:#CFD2DD;} + .d2-4011850205 .stroke-N5{stroke:#DEE1EB;} + .d2-4011850205 .stroke-N6{stroke:#EEF1F8;} + .d2-4011850205 .stroke-N7{stroke:#FFFFFF;} + .d2-4011850205 .stroke-B1{stroke:#0D32B2;} + .d2-4011850205 .stroke-B2{stroke:#0D32B2;} + .d2-4011850205 .stroke-B3{stroke:#E3E9FD;} + .d2-4011850205 .stroke-B4{stroke:#E3E9FD;} + .d2-4011850205 .stroke-B5{stroke:#EDF0FD;} + .d2-4011850205 .stroke-B6{stroke:#F7F8FE;} + .d2-4011850205 .stroke-AA2{stroke:#4A6FF3;} + .d2-4011850205 .stroke-AA4{stroke:#EDF0FD;} + .d2-4011850205 .stroke-AA5{stroke:#F7F8FE;} + .d2-4011850205 .stroke-AB4{stroke:#EDF0FD;} + .d2-4011850205 .stroke-AB5{stroke:#F7F8FE;} + .d2-4011850205 .background-color-N1{background-color:#0A0F25;} + .d2-4011850205 .background-color-N2{background-color:#676C7E;} + .d2-4011850205 .background-color-N3{background-color:#9499AB;} + .d2-4011850205 .background-color-N4{background-color:#CFD2DD;} + .d2-4011850205 .background-color-N5{background-color:#DEE1EB;} + .d2-4011850205 .background-color-N6{background-color:#EEF1F8;} + .d2-4011850205 .background-color-N7{background-color:#FFFFFF;} + .d2-4011850205 .background-color-B1{background-color:#0D32B2;} + .d2-4011850205 .background-color-B2{background-color:#0D32B2;} + .d2-4011850205 .background-color-B3{background-color:#E3E9FD;} + .d2-4011850205 .background-color-B4{background-color:#E3E9FD;} + .d2-4011850205 .background-color-B5{background-color:#EDF0FD;} + .d2-4011850205 .background-color-B6{background-color:#F7F8FE;} + .d2-4011850205 .background-color-AA2{background-color:#4A6FF3;} + .d2-4011850205 .background-color-AA4{background-color:#EDF0FD;} + .d2-4011850205 .background-color-AA5{background-color:#F7F8FE;} + .d2-4011850205 .background-color-AB4{background-color:#EDF0FD;} + .d2-4011850205 .background-color-AB5{background-color:#F7F8FE;} + .d2-4011850205 .color-N1{color:#0A0F25;} + .d2-4011850205 .color-N2{color:#676C7E;} + .d2-4011850205 .color-N3{color:#9499AB;} + .d2-4011850205 .color-N4{color:#CFD2DD;} + .d2-4011850205 .color-N5{color:#DEE1EB;} + .d2-4011850205 .color-N6{color:#EEF1F8;} + .d2-4011850205 .color-N7{color:#FFFFFF;} + .d2-4011850205 .color-B1{color:#0D32B2;} + .d2-4011850205 .color-B2{color:#0D32B2;} + .d2-4011850205 .color-B3{color:#E3E9FD;} + .d2-4011850205 .color-B4{color:#E3E9FD;} + .d2-4011850205 .color-B5{color:#EDF0FD;} + .d2-4011850205 .color-B6{color:#F7F8FE;} + .d2-4011850205 .color-AA2{color:#4A6FF3;} + .d2-4011850205 .color-AA4{color:#EDF0FD;} + .d2-4011850205 .color-AA5{color:#F7F8FE;} + .d2-4011850205 .color-AB4{color:#EDF0FD;} + .d2-4011850205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault @@ -115,8 +115,8 @@ - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json index 3eabfc40cd..ea9131425c 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 267 + "y": 315 }, "width": 53, "height": 66, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 353 + "y": 401 }, "width": 53, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 181 + "y": 487 }, "width": 53, "height": 66, @@ -130,10 +130,10 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 140, - "y": 131 + "x": 150, + "y": 179 }, - "width": 283, + "width": 333, "height": 338, "opacity": 1, "strokeDash": 0, @@ -171,8 +171,8 @@ "id": "l1.b", "type": "rectangle", "pos": { - "x": 190, - "y": 181 + "x": 200, + "y": 229 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "l1.a", "type": "rectangle", "pos": { - "x": 190, - "y": 267 + "x": 200, + "y": 315 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "l1.c", "type": "rectangle", "pos": { - "x": 190, - "y": 353 + "x": 200, + "y": 401 }, "width": 53, "height": 66, @@ -294,7 +294,7 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 513, + "x": 623, "y": 12 }, "width": 153, @@ -335,7 +335,7 @@ "id": "l2c1.a", "type": "rectangle", "pos": { - "x": 563, + "x": 673, "y": 62 }, "width": 53, @@ -376,8 +376,8 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 513, - "y": 434 + "x": 623, + "y": 284 }, "width": 153, "height": 166, @@ -417,8 +417,8 @@ "id": "l2c3.c", "type": "rectangle", "pos": { - "x": 563, - "y": 484 + "x": 673, + "y": 334 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 513, - "y": 198 + "x": 623, + "y": 470 }, "width": 153, "height": 166, @@ -499,8 +499,8 @@ "id": "l2c2.b", "type": "rectangle", "pos": { - "x": 563, - "y": 248 + "x": 673, + "y": 520 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 756, - "y": 62 + "x": 916, + "y": 88 }, "width": 153, "height": 252, @@ -581,8 +581,8 @@ "id": "l3c1.a", "type": "rectangle", "pos": { - "x": 806, - "y": 112 + "x": 966, + "y": 138 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "l3c1.b", "type": "rectangle", "pos": { - "x": 806, - "y": 198 + "x": 966, + "y": 224 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 756, - "y": 434 + "x": 916, + "y": 392 }, "width": 153, "height": 166, @@ -704,8 +704,8 @@ "id": "l3c2.c", "type": "rectangle", "pos": { - "x": 806, - "y": 484 + "x": 966, + "y": 442 }, "width": 53, "height": 66, @@ -745,8 +745,8 @@ "id": "l4", "type": "rectangle", "pos": { - "x": 999, - "y": 12 + "x": 1159, + "y": 20 }, "width": 258, "height": 638, @@ -786,8 +786,8 @@ "id": "l4.c1", "type": "rectangle", "pos": { - "x": 1054, - "y": 62 + "x": 1214, + "y": 70 }, "width": 153, "height": 166, @@ -827,8 +827,8 @@ "id": "l4.c1.a", "type": "rectangle", "pos": { - "x": 1104, - "y": 112 + "x": 1264, + "y": 120 }, "width": 53, "height": 66, @@ -868,8 +868,8 @@ "id": "l4.c2", "type": "rectangle", "pos": { - "x": 1054, - "y": 248 + "x": 1214, + "y": 256 }, "width": 153, "height": 166, @@ -909,8 +909,8 @@ "id": "l4.c2.b", "type": "rectangle", "pos": { - "x": 1104, - "y": 298 + "x": 1264, + "y": 306 }, "width": 53, "height": 66, @@ -950,8 +950,8 @@ "id": "l4.c3", "type": "rectangle", "pos": { - "x": 1054, - "y": 434 + "x": 1214, + "y": 442 }, "width": 153, "height": 166, @@ -991,8 +991,8 @@ "id": "l4.c3.c", "type": "rectangle", "pos": { - "x": 1104, - "y": 484 + "x": 1264, + "y": 492 }, "width": 53, "height": 66, @@ -1056,11 +1056,19 @@ "route": [ { "x": 65, - "y": 214 + "y": 520 }, { - "x": 190, - "y": 214 + "x": 105, + "y": 520 + }, + { + "x": 105, + "y": 262 + }, + { + "x": 200, + "y": 262 } ], "animated": false, @@ -1094,11 +1102,11 @@ "route": [ { "x": 65, - "y": 300 + "y": 348 }, { - "x": 190, - "y": 300 + "x": 200, + "y": 348 } ], "animated": false, @@ -1132,11 +1140,11 @@ "route": [ { "x": 65, - "y": 386 + "y": 434 }, { - "x": 190, - "y": 386 + "x": 200, + "y": 434 } ], "animated": false, @@ -1169,19 +1177,19 @@ "labelPercentage": 0, "route": [ { - "x": 243, - "y": 300 + "x": 253, + "y": 348 }, { - "x": 468, - "y": 300 + "x": 293, + "y": 348 }, { - "x": 468, + "x": 293, "y": 95 }, { - "x": 563, + "x": 673, "y": 95 } ], @@ -1215,20 +1223,28 @@ "labelPercentage": 0, "route": [ { - "x": 243, - "y": 386 + "x": 253, + "y": 434 + }, + { + "x": 343, + "y": 434 + }, + { + "x": 343, + "y": 343 }, { - "x": 468, - "y": 386 + "x": 578, + "y": 343 }, { - "x": 468, - "y": 517 + "x": 578, + "y": 367 }, { - "x": 563, - "y": 517 + "x": 673, + "y": 367 } ], "animated": false, @@ -1261,20 +1277,20 @@ "labelPercentage": 0, "route": [ { - "x": 243, - "y": 214 + "x": 253, + "y": 262 }, { - "x": 333, - "y": 214 + "x": 528, + "y": 262 }, { - "x": 333, - "y": 262 + "x": 528, + "y": 553 }, { - "x": 563, - "y": 262 + "x": 673, + "y": 553 } ], "animated": false, @@ -1307,20 +1323,20 @@ "labelPercentage": 0, "route": [ { - "x": 616, + "x": 726, "y": 95 }, { - "x": 711, + "x": 821, "y": 95 }, { - "x": 711, - "y": 145 + "x": 821, + "y": 171.5 }, { - "x": 806, - "y": 145 + "x": 966, + "y": 171.5 } ], "animated": false, @@ -1353,20 +1369,20 @@ "labelPercentage": 0, "route": [ { - "x": 616, - "y": 281 + "x": 726, + "y": 553 }, { - "x": 711, - "y": 281 + "x": 821, + "y": 553 }, { - "x": 711, - "y": 231 + "x": 821, + "y": 257.5 }, { - "x": 806, - "y": 231 + "x": 966, + "y": 257.5 } ], "animated": false, @@ -1399,12 +1415,20 @@ "labelPercentage": 0, "route": [ { - "x": 616, - "y": 517 + "x": 726, + "y": 367 + }, + { + "x": 871, + "y": 367 }, { - "x": 806, - "y": 517 + "x": 871, + "y": 475.5 + }, + { + "x": 966, + "y": 475.5 } ], "animated": false, @@ -1437,12 +1461,12 @@ "labelPercentage": 0, "route": [ { - "x": 859, - "y": 145 + "x": 1019, + "y": 153.5 }, { - "x": 1104, - "y": 145 + "x": 1264, + "y": 153.5 } ], "animated": false, @@ -1475,20 +1499,20 @@ "labelPercentage": 0, "route": [ { - "x": 859, - "y": 231 + "x": 1019, + "y": 257.5 }, { - "x": 954, - "y": 231 + "x": 1114, + "y": 257.5 }, { - "x": 954, - "y": 331 + "x": 1114, + "y": 339.5 }, { - "x": 1104, - "y": 331 + "x": 1264, + "y": 339.5 } ], "animated": false, @@ -1521,12 +1545,20 @@ "labelPercentage": 0, "route": [ { - "x": 859, - "y": 517 + "x": 1019, + "y": 475.5 + }, + { + "x": 1114, + "y": 475.5 + }, + { + "x": 1114, + "y": 525.5 }, { - "x": 1104, - "y": 517 + "x": 1264, + "y": 525.5 } ], "animated": false, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index 9a16b3856d..f8ba85484b 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3279647977 .fill-N1{fill:#0A0F25;} + .d2-3279647977 .fill-N2{fill:#676C7E;} + .d2-3279647977 .fill-N3{fill:#9499AB;} + .d2-3279647977 .fill-N4{fill:#CFD2DD;} + .d2-3279647977 .fill-N5{fill:#DEE1EB;} + .d2-3279647977 .fill-N6{fill:#EEF1F8;} + .d2-3279647977 .fill-N7{fill:#FFFFFF;} + .d2-3279647977 .fill-B1{fill:#0D32B2;} + .d2-3279647977 .fill-B2{fill:#0D32B2;} + .d2-3279647977 .fill-B3{fill:#E3E9FD;} + .d2-3279647977 .fill-B4{fill:#E3E9FD;} + .d2-3279647977 .fill-B5{fill:#EDF0FD;} + .d2-3279647977 .fill-B6{fill:#F7F8FE;} + .d2-3279647977 .fill-AA2{fill:#4A6FF3;} + .d2-3279647977 .fill-AA4{fill:#EDF0FD;} + .d2-3279647977 .fill-AA5{fill:#F7F8FE;} + .d2-3279647977 .fill-AB4{fill:#EDF0FD;} + .d2-3279647977 .fill-AB5{fill:#F7F8FE;} + .d2-3279647977 .stroke-N1{stroke:#0A0F25;} + .d2-3279647977 .stroke-N2{stroke:#676C7E;} + .d2-3279647977 .stroke-N3{stroke:#9499AB;} + .d2-3279647977 .stroke-N4{stroke:#CFD2DD;} + .d2-3279647977 .stroke-N5{stroke:#DEE1EB;} + .d2-3279647977 .stroke-N6{stroke:#EEF1F8;} + .d2-3279647977 .stroke-N7{stroke:#FFFFFF;} + .d2-3279647977 .stroke-B1{stroke:#0D32B2;} + .d2-3279647977 .stroke-B2{stroke:#0D32B2;} + .d2-3279647977 .stroke-B3{stroke:#E3E9FD;} + .d2-3279647977 .stroke-B4{stroke:#E3E9FD;} + .d2-3279647977 .stroke-B5{stroke:#EDF0FD;} + .d2-3279647977 .stroke-B6{stroke:#F7F8FE;} + .d2-3279647977 .stroke-AA2{stroke:#4A6FF3;} + .d2-3279647977 .stroke-AA4{stroke:#EDF0FD;} + .d2-3279647977 .stroke-AA5{stroke:#F7F8FE;} + .d2-3279647977 .stroke-AB4{stroke:#EDF0FD;} + .d2-3279647977 .stroke-AB5{stroke:#F7F8FE;} + .d2-3279647977 .background-color-N1{background-color:#0A0F25;} + .d2-3279647977 .background-color-N2{background-color:#676C7E;} + .d2-3279647977 .background-color-N3{background-color:#9499AB;} + .d2-3279647977 .background-color-N4{background-color:#CFD2DD;} + .d2-3279647977 .background-color-N5{background-color:#DEE1EB;} + .d2-3279647977 .background-color-N6{background-color:#EEF1F8;} + .d2-3279647977 .background-color-N7{background-color:#FFFFFF;} + .d2-3279647977 .background-color-B1{background-color:#0D32B2;} + .d2-3279647977 .background-color-B2{background-color:#0D32B2;} + .d2-3279647977 .background-color-B3{background-color:#E3E9FD;} + .d2-3279647977 .background-color-B4{background-color:#E3E9FD;} + .d2-3279647977 .background-color-B5{background-color:#EDF0FD;} + .d2-3279647977 .background-color-B6{background-color:#F7F8FE;} + .d2-3279647977 .background-color-AA2{background-color:#4A6FF3;} + .d2-3279647977 .background-color-AA4{background-color:#EDF0FD;} + .d2-3279647977 .background-color-AA5{background-color:#F7F8FE;} + .d2-3279647977 .background-color-AB4{background-color:#EDF0FD;} + .d2-3279647977 .background-color-AB5{background-color:#F7F8FE;} + .d2-3279647977 .color-N1{color:#0A0F25;} + .d2-3279647977 .color-N2{color:#676C7E;} + .d2-3279647977 .color-N3{color:#9499AB;} + .d2-3279647977 .color-N4{color:#CFD2DD;} + .d2-3279647977 .color-N5{color:#DEE1EB;} + .d2-3279647977 .color-N6{color:#EEF1F8;} + .d2-3279647977 .color-N7{color:#FFFFFF;} + .d2-3279647977 .color-B1{color:#0D32B2;} + .d2-3279647977 .color-B2{color:#0D32B2;} + .d2-3279647977 .color-B3{color:#E3E9FD;} + .d2-3279647977 .color-B4{color:#E3E9FD;} + .d2-3279647977 .color-B5{color:#EDF0FD;} + .d2-3279647977 .color-B6{color:#F7F8FE;} + .d2-3279647977 .color-AA2{color:#4A6FF3;} + .d2-3279647977 .color-AA4{color:#EDF0FD;} + .d2-3279647977 .color-AA5{color:#F7F8FE;} + .d2-3279647977 .color-AB4{color:#EDF0FD;} + .d2-3279647977 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index f449aba8d5..8d487dcc39 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 63, + "x": 100, "y": 12 }, "width": 80, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 55, - "y": 494 + "x": 106, + "y": 544 }, "width": 80, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "document", "pos": { - "x": 108, - "y": 338 + "x": 67, + "y": 388 }, "width": 80, "height": 76, @@ -130,8 +130,8 @@ "id": "Oval", "type": "oval", "pos": { - "x": 53, - "y": 158 + "x": 12, + "y": 208 }, "width": 100, "height": 100, @@ -193,28 +193,28 @@ "labelPercentage": 0, "route": [ { - "x": 83, + "x": 160.33299255371094, "y": 78 }, { - "x": 83, + "x": 160.33299255371094, "y": 118 }, { - "x": 12, + "x": 190.83299255371094, "y": 118 }, { - "x": 12, - "y": 454 + "x": 190.83299255371094, + "y": 504 }, { - "x": 82.5, - "y": 454 + "x": 160.33299255371094, + "y": 504 }, { - "x": 82.5, - "y": 494 + "x": 160.33299255371094, + "y": 544 } ], "animated": false, @@ -247,20 +247,12 @@ "labelPercentage": 0, "route": [ { - "x": 148, - "y": 403 + "x": 134, + "y": 444 }, { - "x": 148, - "y": 454 - }, - { - "x": 109.16600036621094, - "y": 454 - }, - { - "x": 109.16600036621094, - "y": 494 + "x": 133.66600036621094, + "y": 544 } ], "animated": false, @@ -305,12 +297,20 @@ "labelPercentage": 0, "route": [ { - "x": 103, + "x": 120.33300018310547, "y": 78 }, { - "x": 103, - "y": 158 + "x": 120.33300018310547, + "y": 118 + }, + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 208 } ], "animated": false, @@ -343,27 +343,27 @@ "labelPercentage": 0, "route": [ { - "x": 161, - "y": 338 + "x": 120, + "y": 388 }, { - "x": 161.33299255371094, - "y": 298 + "x": 120.33300018310547, + "y": 348 }, { - "x": 193, - "y": 298 + "x": 152, + "y": 348 }, { - "x": 193, - "y": 118 + "x": 152, + "y": 168 }, { - "x": 123, - "y": 118 + "x": 140.33299255371094, + "y": 168 }, { - "x": 123, + "x": 140.33299255371094, "y": 78 } ], @@ -397,12 +397,12 @@ "labelPercentage": 0, "route": [ { - "x": 135, - "y": 247 + "x": 94, + "y": 297 }, { - "x": 135, - "y": 338 + "x": 94, + "y": 388 } ], "animated": false, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index 342aeec582..bae3fcb708 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * - - - - + .d2-340114823 .fill-N1{fill:#0A0F25;} + .d2-340114823 .fill-N2{fill:#676C7E;} + .d2-340114823 .fill-N3{fill:#9499AB;} + .d2-340114823 .fill-N4{fill:#CFD2DD;} + .d2-340114823 .fill-N5{fill:#DEE1EB;} + .d2-340114823 .fill-N6{fill:#EEF1F8;} + .d2-340114823 .fill-N7{fill:#FFFFFF;} + .d2-340114823 .fill-B1{fill:#0D32B2;} + .d2-340114823 .fill-B2{fill:#0D32B2;} + .d2-340114823 .fill-B3{fill:#E3E9FD;} + .d2-340114823 .fill-B4{fill:#E3E9FD;} + .d2-340114823 .fill-B5{fill:#EDF0FD;} + .d2-340114823 .fill-B6{fill:#F7F8FE;} + .d2-340114823 .fill-AA2{fill:#4A6FF3;} + .d2-340114823 .fill-AA4{fill:#EDF0FD;} + .d2-340114823 .fill-AA5{fill:#F7F8FE;} + .d2-340114823 .fill-AB4{fill:#EDF0FD;} + .d2-340114823 .fill-AB5{fill:#F7F8FE;} + .d2-340114823 .stroke-N1{stroke:#0A0F25;} + .d2-340114823 .stroke-N2{stroke:#676C7E;} + .d2-340114823 .stroke-N3{stroke:#9499AB;} + .d2-340114823 .stroke-N4{stroke:#CFD2DD;} + .d2-340114823 .stroke-N5{stroke:#DEE1EB;} + .d2-340114823 .stroke-N6{stroke:#EEF1F8;} + .d2-340114823 .stroke-N7{stroke:#FFFFFF;} + .d2-340114823 .stroke-B1{stroke:#0D32B2;} + .d2-340114823 .stroke-B2{stroke:#0D32B2;} + .d2-340114823 .stroke-B3{stroke:#E3E9FD;} + .d2-340114823 .stroke-B4{stroke:#E3E9FD;} + .d2-340114823 .stroke-B5{stroke:#EDF0FD;} + .d2-340114823 .stroke-B6{stroke:#F7F8FE;} + .d2-340114823 .stroke-AA2{stroke:#4A6FF3;} + .d2-340114823 .stroke-AA4{stroke:#EDF0FD;} + .d2-340114823 .stroke-AA5{stroke:#F7F8FE;} + .d2-340114823 .stroke-AB4{stroke:#EDF0FD;} + .d2-340114823 .stroke-AB5{stroke:#F7F8FE;} + .d2-340114823 .background-color-N1{background-color:#0A0F25;} + .d2-340114823 .background-color-N2{background-color:#676C7E;} + .d2-340114823 .background-color-N3{background-color:#9499AB;} + .d2-340114823 .background-color-N4{background-color:#CFD2DD;} + .d2-340114823 .background-color-N5{background-color:#DEE1EB;} + .d2-340114823 .background-color-N6{background-color:#EEF1F8;} + .d2-340114823 .background-color-N7{background-color:#FFFFFF;} + .d2-340114823 .background-color-B1{background-color:#0D32B2;} + .d2-340114823 .background-color-B2{background-color:#0D32B2;} + .d2-340114823 .background-color-B3{background-color:#E3E9FD;} + .d2-340114823 .background-color-B4{background-color:#E3E9FD;} + .d2-340114823 .background-color-B5{background-color:#EDF0FD;} + .d2-340114823 .background-color-B6{background-color:#F7F8FE;} + .d2-340114823 .background-color-AA2{background-color:#4A6FF3;} + .d2-340114823 .background-color-AA4{background-color:#EDF0FD;} + .d2-340114823 .background-color-AA5{background-color:#F7F8FE;} + .d2-340114823 .background-color-AB4{background-color:#EDF0FD;} + .d2-340114823 .background-color-AB5{background-color:#F7F8FE;} + .d2-340114823 .color-N1{color:#0A0F25;} + .d2-340114823 .color-N2{color:#676C7E;} + .d2-340114823 .color-N3{color:#9499AB;} + .d2-340114823 .color-N4{color:#CFD2DD;} + .d2-340114823 .color-N5{color:#DEE1EB;} + .d2-340114823 .color-N6{color:#EEF1F8;} + .d2-340114823 .color-N7{color:#FFFFFF;} + .d2-340114823 .color-B1{color:#0D32B2;} + .d2-340114823 .color-B2{color:#0D32B2;} + .d2-340114823 .color-B3{color:#E3E9FD;} + .d2-340114823 .color-B4{color:#E3E9FD;} + .d2-340114823 .color-B5{color:#EDF0FD;} + .d2-340114823 .color-B6{color:#F7F8FE;} + .d2-340114823 .color-AA2{color:#4A6FF3;} + .d2-340114823 .color-AA4{color:#EDF0FD;} + .d2-340114823 .color-AA5{color:#F7F8FE;} + .d2-340114823 .color-AB4{color:#EDF0FD;} + .d2-340114823 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc * + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 2fa8fc7c5d..db004ac55b 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -153,11 +153,11 @@ "labelPercentage": 0, "route": [ { - "x": 38.66600036621094, + "x": 65.33300018310547, "y": 78 }, { - "x": 38.66600036621094, + "x": 65.33300018310547, "y": 208 } ], @@ -191,11 +191,11 @@ "labelPercentage": 0, "route": [ { - "x": 38.66600036621094, + "x": 60.83300018310547, "y": 274 }, { - "x": 38.66600036621094, + "x": 60.83300018310547, "y": 404 } ], @@ -229,11 +229,11 @@ "labelPercentage": 0, "route": [ { - "x": 65.33300018310547, + "x": 38.66600036621094, "y": 404 }, { - "x": 65.33300018310547, + "x": 38.66600036621094, "y": 274 } ], @@ -267,11 +267,11 @@ "labelPercentage": 0, "route": [ { - "x": 60.83300018310547, + "x": 43.16600036621094, "y": 208 }, { - "x": 60.83300018310547, + "x": 43.16600036621094, "y": 78 } ], diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index 27964a8cea..f593147c0e 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-2406160022 .fill-N1{fill:#0A0F25;} + .d2-2406160022 .fill-N2{fill:#676C7E;} + .d2-2406160022 .fill-N3{fill:#9499AB;} + .d2-2406160022 .fill-N4{fill:#CFD2DD;} + .d2-2406160022 .fill-N5{fill:#DEE1EB;} + .d2-2406160022 .fill-N6{fill:#EEF1F8;} + .d2-2406160022 .fill-N7{fill:#FFFFFF;} + .d2-2406160022 .fill-B1{fill:#0D32B2;} + .d2-2406160022 .fill-B2{fill:#0D32B2;} + .d2-2406160022 .fill-B3{fill:#E3E9FD;} + .d2-2406160022 .fill-B4{fill:#E3E9FD;} + .d2-2406160022 .fill-B5{fill:#EDF0FD;} + .d2-2406160022 .fill-B6{fill:#F7F8FE;} + .d2-2406160022 .fill-AA2{fill:#4A6FF3;} + .d2-2406160022 .fill-AA4{fill:#EDF0FD;} + .d2-2406160022 .fill-AA5{fill:#F7F8FE;} + .d2-2406160022 .fill-AB4{fill:#EDF0FD;} + .d2-2406160022 .fill-AB5{fill:#F7F8FE;} + .d2-2406160022 .stroke-N1{stroke:#0A0F25;} + .d2-2406160022 .stroke-N2{stroke:#676C7E;} + .d2-2406160022 .stroke-N3{stroke:#9499AB;} + .d2-2406160022 .stroke-N4{stroke:#CFD2DD;} + .d2-2406160022 .stroke-N5{stroke:#DEE1EB;} + .d2-2406160022 .stroke-N6{stroke:#EEF1F8;} + .d2-2406160022 .stroke-N7{stroke:#FFFFFF;} + .d2-2406160022 .stroke-B1{stroke:#0D32B2;} + .d2-2406160022 .stroke-B2{stroke:#0D32B2;} + .d2-2406160022 .stroke-B3{stroke:#E3E9FD;} + .d2-2406160022 .stroke-B4{stroke:#E3E9FD;} + .d2-2406160022 .stroke-B5{stroke:#EDF0FD;} + .d2-2406160022 .stroke-B6{stroke:#F7F8FE;} + .d2-2406160022 .stroke-AA2{stroke:#4A6FF3;} + .d2-2406160022 .stroke-AA4{stroke:#EDF0FD;} + .d2-2406160022 .stroke-AA5{stroke:#F7F8FE;} + .d2-2406160022 .stroke-AB4{stroke:#EDF0FD;} + .d2-2406160022 .stroke-AB5{stroke:#F7F8FE;} + .d2-2406160022 .background-color-N1{background-color:#0A0F25;} + .d2-2406160022 .background-color-N2{background-color:#676C7E;} + .d2-2406160022 .background-color-N3{background-color:#9499AB;} + .d2-2406160022 .background-color-N4{background-color:#CFD2DD;} + .d2-2406160022 .background-color-N5{background-color:#DEE1EB;} + .d2-2406160022 .background-color-N6{background-color:#EEF1F8;} + .d2-2406160022 .background-color-N7{background-color:#FFFFFF;} + .d2-2406160022 .background-color-B1{background-color:#0D32B2;} + .d2-2406160022 .background-color-B2{background-color:#0D32B2;} + .d2-2406160022 .background-color-B3{background-color:#E3E9FD;} + .d2-2406160022 .background-color-B4{background-color:#E3E9FD;} + .d2-2406160022 .background-color-B5{background-color:#EDF0FD;} + .d2-2406160022 .background-color-B6{background-color:#F7F8FE;} + .d2-2406160022 .background-color-AA2{background-color:#4A6FF3;} + .d2-2406160022 .background-color-AA4{background-color:#EDF0FD;} + .d2-2406160022 .background-color-AA5{background-color:#F7F8FE;} + .d2-2406160022 .background-color-AB4{background-color:#EDF0FD;} + .d2-2406160022 .background-color-AB5{background-color:#F7F8FE;} + .d2-2406160022 .color-N1{color:#0A0F25;} + .d2-2406160022 .color-N2{color:#676C7E;} + .d2-2406160022 .color-N3{color:#9499AB;} + .d2-2406160022 .color-N4{color:#CFD2DD;} + .d2-2406160022 .color-N5{color:#DEE1EB;} + .d2-2406160022 .color-N6{color:#EEF1F8;} + .d2-2406160022 .color-N7{color:#FFFFFF;} + .d2-2406160022 .color-B1{color:#0D32B2;} + .d2-2406160022 .color-B2{color:#0D32B2;} + .d2-2406160022 .color-B3{color:#E3E9FD;} + .d2-2406160022 .color-B4{color:#E3E9FD;} + .d2-2406160022 .color-B5{color:#EDF0FD;} + .d2-2406160022 .color-B6{color:#F7F8FE;} + .d2-2406160022 .color-AA2{color:#4A6FF3;} + .d2-2406160022 .color-AA4{color:#EDF0FD;} + .d2-2406160022 .color-AA5{color:#F7F8FE;} + .d2-2406160022 .color-AB4{color:#EDF0FD;} + .d2-2406160022 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc diff --git a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json index 1eb62f0b75..e71bc5a806 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json @@ -47,7 +47,7 @@ "id": "poll the people", "type": "rectangle", "pos": { - "x": 110, + "x": 54, "y": 12 }, "width": 150, @@ -88,7 +88,7 @@ "id": "results", "type": "rectangle", "pos": { - "x": 64, + "x": 157, "y": 158 }, "width": 93, @@ -129,7 +129,7 @@ "id": "unfavorable", "type": "rectangle", "pos": { - "x": 172, + "x": 12, "y": 304 }, "width": 131, @@ -170,7 +170,7 @@ "id": "favorable", "type": "rectangle", "pos": { - "x": 39, + "x": 163, "y": 304 }, "width": 113, @@ -211,7 +211,7 @@ "id": "will of the people", "type": "rectangle", "pos": { - "x": 12, + "x": 136, "y": 440 }, "width": 167, @@ -275,19 +275,19 @@ "labelPercentage": 0, "route": [ { - "x": 160.16600036621094, + "x": 154.83299255371094, "y": 78 }, { - "x": 160.16600036621094, + "x": 154.83299255371094, "y": 118 }, { - "x": 111, + "x": 204, "y": 118 }, { - "x": 111, + "x": 204, "y": 158 } ], @@ -321,19 +321,19 @@ "labelPercentage": 0, "route": [ { - "x": 126.5, + "x": 188.5, "y": 224 }, { - "x": 126.5, + "x": 188.5, "y": 264 }, { - "x": 215.66600036621094, + "x": 99.33300018310547, "y": 264 }, { - "x": 215.66600036621094, + "x": 99.33300018310547, "y": 304 } ], @@ -367,19 +367,19 @@ "labelPercentage": 0, "route": [ { - "x": 259.3330078125, + "x": 55.66600036621094, "y": 304 }, { - "x": 259.3330078125, + "x": 55.66600036621094, "y": 118 }, { - "x": 210.16600036621094, + "x": 104.83300018310547, "y": 118 }, { - "x": 210.16600036621094, + "x": 104.83300018310547, "y": 78 } ], @@ -413,11 +413,11 @@ "labelPercentage": 0, "route": [ { - "x": 95.5, + "x": 219.5, "y": 224 }, { - "x": 95.5, + "x": 219.5, "y": 304 } ], @@ -451,11 +451,11 @@ "labelPercentage": 0, "route": [ { - "x": 95.5, + "x": 219.5, "y": 370 }, { - "x": 95.5, + "x": 219.5, "y": 440 } ], diff --git a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg index e5d271726c..099b867654 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

A winning strategy

-
poll the peopleresultsunfavorablefavorablewill of the people +poll the peopleresultsunfavorablefavorablewill of the people - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/elk/board.exp.json b/e2etests/testdata/stable/cycle-order/elk/board.exp.json index 013018d814..aa2fed8767 100644 --- a/e2etests/testdata/stable/cycle-order/elk/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/elk/board.exp.json @@ -11,7 +11,7 @@ ], "pos": { "x": 12, - "y": 80 + "y": 12 }, "width": 170, "height": 196, @@ -55,7 +55,7 @@ ], "pos": { "x": 262, - "y": 12 + "y": 81 }, "width": 170, "height": 196, @@ -99,7 +99,7 @@ ], "pos": { "x": 502, - "y": 12 + "y": 81 }, "width": 170, "height": 196, @@ -143,7 +143,7 @@ ], "pos": { "x": 742, - "y": 12 + "y": 81 }, "width": 177, "height": 196, @@ -187,7 +187,7 @@ ], "pos": { "x": 989, - "y": 12 + "y": 81 }, "width": 177, "height": 196, @@ -231,7 +231,7 @@ ], "pos": { "x": 1236, - "y": 12 + "y": 81 }, "width": 197, "height": 196, @@ -275,7 +275,7 @@ ], "pos": { "x": 1503, - "y": 12 + "y": 81 }, "width": 187, "height": 196, @@ -319,7 +319,7 @@ ], "pos": { "x": 1760, - "y": 12 + "y": 81 }, "width": 170, "height": 196, @@ -363,7 +363,7 @@ ], "pos": { "x": 2010, - "y": 80 + "y": 12 }, "width": 170, "height": 196, @@ -407,7 +407,7 @@ ], "pos": { "x": 62, - "y": 131 + "y": 62 }, "width": 70, "height": 70, @@ -463,7 +463,7 @@ ], "pos": { "x": 312, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -519,7 +519,7 @@ ], "pos": { "x": 552, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -575,7 +575,7 @@ ], "pos": { "x": 792, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -631,7 +631,7 @@ ], "pos": { "x": 1039, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -687,7 +687,7 @@ ], "pos": { "x": 1286, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -743,7 +743,7 @@ ], "pos": { "x": 1553, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -799,7 +799,7 @@ ], "pos": { "x": 1810, - "y": 62 + "y": 131 }, "width": 70, "height": 70, @@ -855,7 +855,7 @@ ], "pos": { "x": 2060, - "y": 131 + "y": 62 }, "width": 70, "height": 70, @@ -931,11 +931,11 @@ "route": [ { "x": 182, - "y": 110 + "y": 179.5 }, { "x": 262, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -969,11 +969,11 @@ "route": [ { "x": 432, - "y": 110 + "y": 179.5 }, { "x": 502, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1007,11 +1007,11 @@ "route": [ { "x": 672, - "y": 110 + "y": 179.5 }, { "x": 742, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1045,11 +1045,11 @@ "route": [ { "x": 919, - "y": 110 + "y": 179.5 }, { "x": 989, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1083,11 +1083,11 @@ "route": [ { "x": 1166, - "y": 110 + "y": 179.5 }, { "x": 1236, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1121,11 +1121,11 @@ "route": [ { "x": 1433, - "y": 110 + "y": 179.5 }, { "x": 1503, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1159,11 +1159,11 @@ "route": [ { "x": 1690, - "y": 110 + "y": 179.5 }, { "x": 1760, - "y": 110 + "y": 179.5 } ], "animated": false, @@ -1197,11 +1197,11 @@ "route": [ { "x": 1930, - "y": 146.33299255371094 + "y": 142.66600036621094 }, { "x": 2010, - "y": 146.33299255371094 + "y": 142.66600036621094 } ], "animated": false, @@ -1235,11 +1235,11 @@ "route": [ { "x": 2010, - "y": 248 + "y": 40.5 }, { "x": 182, - "y": 248 + "y": 40.5 } ], "animated": false, diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index 7ce3272615..30b32b0077 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - - - - - - - - - - - - - - - - - - - + .d2-272655660 .fill-N1{fill:#0A0F25;} + .d2-272655660 .fill-N2{fill:#676C7E;} + .d2-272655660 .fill-N3{fill:#9499AB;} + .d2-272655660 .fill-N4{fill:#CFD2DD;} + .d2-272655660 .fill-N5{fill:#DEE1EB;} + .d2-272655660 .fill-N6{fill:#EEF1F8;} + .d2-272655660 .fill-N7{fill:#FFFFFF;} + .d2-272655660 .fill-B1{fill:#0D32B2;} + .d2-272655660 .fill-B2{fill:#0D32B2;} + .d2-272655660 .fill-B3{fill:#E3E9FD;} + .d2-272655660 .fill-B4{fill:#E3E9FD;} + .d2-272655660 .fill-B5{fill:#EDF0FD;} + .d2-272655660 .fill-B6{fill:#F7F8FE;} + .d2-272655660 .fill-AA2{fill:#4A6FF3;} + .d2-272655660 .fill-AA4{fill:#EDF0FD;} + .d2-272655660 .fill-AA5{fill:#F7F8FE;} + .d2-272655660 .fill-AB4{fill:#EDF0FD;} + .d2-272655660 .fill-AB5{fill:#F7F8FE;} + .d2-272655660 .stroke-N1{stroke:#0A0F25;} + .d2-272655660 .stroke-N2{stroke:#676C7E;} + .d2-272655660 .stroke-N3{stroke:#9499AB;} + .d2-272655660 .stroke-N4{stroke:#CFD2DD;} + .d2-272655660 .stroke-N5{stroke:#DEE1EB;} + .d2-272655660 .stroke-N6{stroke:#EEF1F8;} + .d2-272655660 .stroke-N7{stroke:#FFFFFF;} + .d2-272655660 .stroke-B1{stroke:#0D32B2;} + .d2-272655660 .stroke-B2{stroke:#0D32B2;} + .d2-272655660 .stroke-B3{stroke:#E3E9FD;} + .d2-272655660 .stroke-B4{stroke:#E3E9FD;} + .d2-272655660 .stroke-B5{stroke:#EDF0FD;} + .d2-272655660 .stroke-B6{stroke:#F7F8FE;} + .d2-272655660 .stroke-AA2{stroke:#4A6FF3;} + .d2-272655660 .stroke-AA4{stroke:#EDF0FD;} + .d2-272655660 .stroke-AA5{stroke:#F7F8FE;} + .d2-272655660 .stroke-AB4{stroke:#EDF0FD;} + .d2-272655660 .stroke-AB5{stroke:#F7F8FE;} + .d2-272655660 .background-color-N1{background-color:#0A0F25;} + .d2-272655660 .background-color-N2{background-color:#676C7E;} + .d2-272655660 .background-color-N3{background-color:#9499AB;} + .d2-272655660 .background-color-N4{background-color:#CFD2DD;} + .d2-272655660 .background-color-N5{background-color:#DEE1EB;} + .d2-272655660 .background-color-N6{background-color:#EEF1F8;} + .d2-272655660 .background-color-N7{background-color:#FFFFFF;} + .d2-272655660 .background-color-B1{background-color:#0D32B2;} + .d2-272655660 .background-color-B2{background-color:#0D32B2;} + .d2-272655660 .background-color-B3{background-color:#E3E9FD;} + .d2-272655660 .background-color-B4{background-color:#E3E9FD;} + .d2-272655660 .background-color-B5{background-color:#EDF0FD;} + .d2-272655660 .background-color-B6{background-color:#F7F8FE;} + .d2-272655660 .background-color-AA2{background-color:#4A6FF3;} + .d2-272655660 .background-color-AA4{background-color:#EDF0FD;} + .d2-272655660 .background-color-AA5{background-color:#F7F8FE;} + .d2-272655660 .background-color-AB4{background-color:#EDF0FD;} + .d2-272655660 .background-color-AB5{background-color:#F7F8FE;} + .d2-272655660 .color-N1{color:#0A0F25;} + .d2-272655660 .color-N2{color:#676C7E;} + .d2-272655660 .color-N3{color:#9499AB;} + .d2-272655660 .color-N4{color:#CFD2DD;} + .d2-272655660 .color-N5{color:#DEE1EB;} + .d2-272655660 .color-N6{color:#EEF1F8;} + .d2-272655660 .color-N7{color:#FFFFFF;} + .d2-272655660 .color-B1{color:#0D32B2;} + .d2-272655660 .color-B2{color:#0D32B2;} + .d2-272655660 .color-B3{color:#E3E9FD;} + .d2-272655660 .color-B4{color:#E3E9FD;} + .d2-272655660 .color-B5{color:#EDF0FD;} + .d2-272655660 .color-B6{color:#F7F8FE;} + .d2-272655660 .color-AA2{color:#4A6FF3;} + .d2-272655660 .color-AA4{color:#EDF0FD;} + .d2-272655660 .color-AA5{color:#F7F8FE;} + .d2-272655660 .color-AB4{color:#EDF0FD;} + .d2-272655660 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json index e6a4ed52fc..73197e9a50 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json @@ -7,10 +7,10 @@ "id": "a", "type": "rectangle", "pos": { - "x": 184, + "x": 56, "y": 373 }, - "width": 487, + "width": 571, "height": 585, "opacity": 1, "strokeDash": 0, @@ -48,7 +48,7 @@ "id": "a.k", "type": "rectangle", "pos": { - "x": 234, + "x": 106, "y": 423 }, "width": 151, @@ -89,7 +89,7 @@ "id": "a.k.t", "type": "rectangle", "pos": { - "x": 284, + "x": 156, "y": 473 }, "width": 51, @@ -130,7 +130,7 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 253, + "x": 210, "y": 679 }, "width": 367, @@ -174,7 +174,7 @@ "OutsideTopCenter" ], "pos": { - "x": 303, + "x": 260, "y": 771 }, "width": 54, @@ -215,7 +215,7 @@ "id": "a.f.g", "type": "rectangle", "pos": { - "x": 377, + "x": 334, "y": 758 }, "width": 54, @@ -256,8 +256,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 381, - "y": 1549 + "x": 493, + "y": 1629 }, "width": 424, "height": 290, @@ -300,8 +300,8 @@ "icon" ], "pos": { - "x": 431, - "y": 1599 + "x": 543, + "y": 1679 }, "width": 151, "height": 190, @@ -353,7 +353,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 12, + "x": 647, "y": 792 }, "width": 152, @@ -394,7 +394,7 @@ "id": "k.s", "type": "rectangle", "pos": { - "x": 62, + "x": 697, "y": 842 }, "width": 52, @@ -435,11 +435,11 @@ "id": "u", "type": "rectangle", "pos": { - "x": 245, - "y": 1098 + "x": 580, + "y": 1048 }, "width": 694, - "height": 361, + "height": 491, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 295, - "y": 1153 + "x": 630, + "y": 1233 }, "width": 54, "height": 66, @@ -517,7 +517,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 299, + "x": 340, "y": 12 }, "width": 252, @@ -558,7 +558,7 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 349, + "x": 390, "y": 62 }, "width": 152, @@ -599,7 +599,7 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 399, + "x": 440, "y": 112 }, "width": 52, @@ -644,7 +644,7 @@ "IconOutsideLeftTop" ], "pos": { - "x": 494, + "x": 451, "y": 735 }, "width": 76, @@ -700,8 +700,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 369, - "y": 1153 + "x": 704, + "y": 1233 }, "width": 150, "height": 148, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 419, - "y": 1181 + "x": 754, + "y": 1261 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 539, - "y": 1343 + "x": 874, + "y": 1423 }, "width": 195, "height": 66, @@ -829,8 +829,8 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 602, - "y": 1604 + "x": 714, + "y": 1684 }, "width": 153, "height": 166, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 652, - "y": 1654 + "x": 764, + "y": 1734 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 481, - "y": 1673 + "x": 593, + "y": 1753 }, "width": 51, "height": 66, @@ -952,8 +952,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 431, - "y": 1919 + "x": 543, + "y": 1999 }, "width": 151, "height": 166, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 481, - "y": 1969 + "x": 593, + "y": 2049 }, "width": 51, "height": 66, @@ -1034,7 +1034,7 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 466, + "x": 277, "y": 428 }, "width": 149, @@ -1075,7 +1075,7 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 516, + "x": 327, "y": 478 }, "width": 49, @@ -1139,19 +1139,19 @@ "labelPercentage": 0, "route": [ { - "x": 309.5, + "x": 182, "y": 539 }, { - "x": 309.5, + "x": 182, "y": 634 }, { - "x": 330.25, + "x": 287.25, "y": 634 }, { - "x": 330.25, + "x": 287.25, "y": 729 } ], @@ -1185,28 +1185,20 @@ "labelPercentage": 0, "route": [ { - "x": 404.25, + "x": 361.25, "y": 824 }, { - "x": 404.25, - "y": 1003 + "x": 361.25, + "y": 1584 }, { - "x": 204.125, - "y": 1003 + "x": 619.25, + "y": 1584 }, { - "x": 204.125, - "y": 1504 - }, - { - "x": 506.5, - "y": 1504 - }, - { - "x": 506.5, - "y": 1599 + "x": 619.25, + "y": 1679 } ], "animated": false, @@ -1239,20 +1231,20 @@ "labelPercentage": 0, "route": [ { - "x": 88, + "x": 723.25, "y": 908 }, { - "x": 88, - "y": 1053 + "x": 723.25, + "y": 1138 }, { - "x": 322.125, - "y": 1053 + "x": 657.25, + "y": 1138 }, { - "x": 322.125, - "y": 1153 + "x": 657.25, + "y": 1233 } ], "animated": false, @@ -1285,19 +1277,19 @@ "labelPercentage": 0, "route": [ { - "x": 425, + "x": 466.5, "y": 178 }, { - "x": 425, + "x": 466.5, "y": 634 }, { - "x": 404.25, + "x": 361.25, "y": 634 }, { - "x": 404.25, + "x": 361.25, "y": 758 } ], @@ -1331,20 +1323,20 @@ "labelPercentage": 0, "route": [ { - "x": 510.75, + "x": 467.75, "y": 853 }, { - "x": 510.75, - "y": 1003 + "x": 467.75, + "y": 1188 }, { - "x": 444.125, - "y": 1003 + "x": 779.25, + "y": 1188 }, { - "x": 444.125, - "y": 1181 + "x": 779.25, + "y": 1261 } ], "animated": false, @@ -1377,12 +1369,20 @@ "labelPercentage": 0, "route": [ { - "x": 678.5, - "y": 1409 + "x": 1049.25, + "y": 1489 + }, + { + "x": 1049.25, + "y": 1584 + }, + { + "x": 791.25, + "y": 1584 }, { - "x": 678.5, - "y": 1654 + "x": 791.25, + "y": 1734 } ], "animated": false, @@ -1415,12 +1415,12 @@ "labelPercentage": 0, "route": [ { - "x": 506.5, - "y": 1789 + "x": 619.25, + "y": 1869 }, { - "x": 506.5, - "y": 1969 + "x": 619.25, + "y": 2049 } ], "animated": false, @@ -1453,27 +1453,27 @@ "labelPercentage": 0, "route": [ { - "x": 506.5, - "y": 2035 + "x": 619.25, + "y": 2115 }, { - "x": 506.5, - "y": 2130 + "x": 619.25, + "y": 2210 }, { - "x": 963.625, - "y": 2130 + "x": 16.5, + "y": 2210 }, { - "x": 963.625, + "x": 16.5, "y": 328 }, { - "x": 540.5, + "x": 352, "y": 328 }, { - "x": 540.5, + "x": 352, "y": 478 } ], diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg index b7bfdc6c3b..f7fda64ce8 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3415502357 .fill-N1{fill:#0A0F25;} + .d2-3415502357 .fill-N2{fill:#676C7E;} + .d2-3415502357 .fill-N3{fill:#9499AB;} + .d2-3415502357 .fill-N4{fill:#CFD2DD;} + .d2-3415502357 .fill-N5{fill:#DEE1EB;} + .d2-3415502357 .fill-N6{fill:#EEF1F8;} + .d2-3415502357 .fill-N7{fill:#FFFFFF;} + .d2-3415502357 .fill-B1{fill:#0D32B2;} + .d2-3415502357 .fill-B2{fill:#0D32B2;} + .d2-3415502357 .fill-B3{fill:#E3E9FD;} + .d2-3415502357 .fill-B4{fill:#E3E9FD;} + .d2-3415502357 .fill-B5{fill:#EDF0FD;} + .d2-3415502357 .fill-B6{fill:#F7F8FE;} + .d2-3415502357 .fill-AA2{fill:#4A6FF3;} + .d2-3415502357 .fill-AA4{fill:#EDF0FD;} + .d2-3415502357 .fill-AA5{fill:#F7F8FE;} + .d2-3415502357 .fill-AB4{fill:#EDF0FD;} + .d2-3415502357 .fill-AB5{fill:#F7F8FE;} + .d2-3415502357 .stroke-N1{stroke:#0A0F25;} + .d2-3415502357 .stroke-N2{stroke:#676C7E;} + .d2-3415502357 .stroke-N3{stroke:#9499AB;} + .d2-3415502357 .stroke-N4{stroke:#CFD2DD;} + .d2-3415502357 .stroke-N5{stroke:#DEE1EB;} + .d2-3415502357 .stroke-N6{stroke:#EEF1F8;} + .d2-3415502357 .stroke-N7{stroke:#FFFFFF;} + .d2-3415502357 .stroke-B1{stroke:#0D32B2;} + .d2-3415502357 .stroke-B2{stroke:#0D32B2;} + .d2-3415502357 .stroke-B3{stroke:#E3E9FD;} + .d2-3415502357 .stroke-B4{stroke:#E3E9FD;} + .d2-3415502357 .stroke-B5{stroke:#EDF0FD;} + .d2-3415502357 .stroke-B6{stroke:#F7F8FE;} + .d2-3415502357 .stroke-AA2{stroke:#4A6FF3;} + .d2-3415502357 .stroke-AA4{stroke:#EDF0FD;} + .d2-3415502357 .stroke-AA5{stroke:#F7F8FE;} + .d2-3415502357 .stroke-AB4{stroke:#EDF0FD;} + .d2-3415502357 .stroke-AB5{stroke:#F7F8FE;} + .d2-3415502357 .background-color-N1{background-color:#0A0F25;} + .d2-3415502357 .background-color-N2{background-color:#676C7E;} + .d2-3415502357 .background-color-N3{background-color:#9499AB;} + .d2-3415502357 .background-color-N4{background-color:#CFD2DD;} + .d2-3415502357 .background-color-N5{background-color:#DEE1EB;} + .d2-3415502357 .background-color-N6{background-color:#EEF1F8;} + .d2-3415502357 .background-color-N7{background-color:#FFFFFF;} + .d2-3415502357 .background-color-B1{background-color:#0D32B2;} + .d2-3415502357 .background-color-B2{background-color:#0D32B2;} + .d2-3415502357 .background-color-B3{background-color:#E3E9FD;} + .d2-3415502357 .background-color-B4{background-color:#E3E9FD;} + .d2-3415502357 .background-color-B5{background-color:#EDF0FD;} + .d2-3415502357 .background-color-B6{background-color:#F7F8FE;} + .d2-3415502357 .background-color-AA2{background-color:#4A6FF3;} + .d2-3415502357 .background-color-AA4{background-color:#EDF0FD;} + .d2-3415502357 .background-color-AA5{background-color:#F7F8FE;} + .d2-3415502357 .background-color-AB4{background-color:#EDF0FD;} + .d2-3415502357 .background-color-AB5{background-color:#F7F8FE;} + .d2-3415502357 .color-N1{color:#0A0F25;} + .d2-3415502357 .color-N2{color:#676C7E;} + .d2-3415502357 .color-N3{color:#9499AB;} + .d2-3415502357 .color-N4{color:#CFD2DD;} + .d2-3415502357 .color-N5{color:#DEE1EB;} + .d2-3415502357 .color-N6{color:#EEF1F8;} + .d2-3415502357 .color-N7{color:#FFFFFF;} + .d2-3415502357 .color-B1{color:#0D32B2;} + .d2-3415502357 .color-B2{color:#0D32B2;} + .d2-3415502357 .color-B3{color:#E3E9FD;} + .d2-3415502357 .color-B4{color:#E3E9FD;} + .d2-3415502357 .color-B5{color:#EDF0FD;} + .d2-3415502357 .color-B6{color:#F7F8FE;} + .d2-3415502357 .color-AA2{color:#4A6FF3;} + .d2-3415502357 .color-AA4{color:#EDF0FD;} + .d2-3415502357 .color-AA5{color:#F7F8FE;} + .d2-3415502357 .color-AB4{color:#EDF0FD;} + .d2-3415502357 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json index a25b67e74e..295f8d3bad 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -8,10 +8,10 @@ "type": "rectangle", "pos": { "x": 359, - "y": 198 + "y": 87 }, "width": 565, - "height": 548, + "height": 616, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 409, - "y": 273 + "y": 137 }, "width": 151, "height": 166, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 459, - "y": 323 + "y": 187 }, "width": 51, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 650, - "y": 248 + "y": 205 }, "width": 219, "height": 448, @@ -175,7 +175,7 @@ ], "pos": { "x": 700, - "y": 340 + "y": 297 }, "width": 54, "height": 82, @@ -216,7 +216,7 @@ "type": "rectangle", "pos": { "x": 732, - "y": 442 + "y": 399 }, "width": 54, "height": 66, @@ -256,8 +256,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 1604, - "y": 377 + "x": 1684, + "y": 508 }, "width": 258, "height": 476, @@ -300,8 +300,8 @@ "icon" ], "pos": { - "x": 1657, - "y": 427 + "x": 1737, + "y": 558 }, "width": 151, "height": 190, @@ -354,7 +354,7 @@ "type": "rectangle", "pos": { "x": 772, - "y": 12 + "y": 723 }, "width": 152, "height": 166, @@ -395,7 +395,7 @@ "type": "rectangle", "pos": { "x": 822, - "y": 62 + "y": 773 }, "width": 52, "height": 66, @@ -435,10 +435,10 @@ "id": "u", "type": "rectangle", "pos": { - "x": 1064, - "y": 323 + "x": 1014, + "y": 627 }, - "width": 450, + "width": 580, "height": 528, "opacity": 1, "strokeDash": 0, @@ -476,8 +476,8 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 1119, - "y": 373 + "x": 1199, + "y": 677 }, "width": 54, "height": 66, @@ -518,7 +518,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 346 + "y": 396 }, "width": 257, "height": 266, @@ -559,7 +559,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 396 + "y": 446 }, "width": 152, "height": 166, @@ -600,7 +600,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 446 + "y": 496 }, "width": 52, "height": 66, @@ -645,7 +645,7 @@ ], "pos": { "x": 743, - "y": 528 + "y": 485 }, "width": 76, "height": 118, @@ -700,8 +700,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 1119, - "y": 459 + "x": 1199, + "y": 763 }, "width": 150, "height": 148, @@ -744,8 +744,8 @@ "OutsideBottomCenter" ], "pos": { - "x": 1169, - "y": 487 + "x": 1249, + "y": 791 }, "width": 50, "height": 66, @@ -788,8 +788,8 @@ "OutsideRightMiddle" ], "pos": { - "x": 1114, - "y": 735 + "x": 1194, + "y": 1039 }, "width": 195, "height": 66, @@ -829,8 +829,8 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 1659, - "y": 637 + "x": 1739, + "y": 768 }, "width": 153, "height": 166, @@ -870,8 +870,8 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 1709, - "y": 687 + "x": 1789, + "y": 818 }, "width": 53, "height": 66, @@ -911,8 +911,8 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 1707, - "y": 501 + "x": 1787, + "y": 632 }, "width": 51, "height": 66, @@ -952,8 +952,8 @@ "id": "y", "type": "rectangle", "pos": { - "x": 1942, - "y": 439 + "x": 2022, + "y": 570 }, "width": 151, "height": 166, @@ -993,8 +993,8 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 1992, - "y": 489 + "x": 2072, + "y": 620 }, "width": 51, "height": 66, @@ -1035,7 +1035,7 @@ "type": "rectangle", "pos": { "x": 414, - "y": 520 + "y": 323 }, "width": 149, "height": 166, @@ -1076,7 +1076,7 @@ "type": "rectangle", "pos": { "x": 464, - "y": 570 + "y": 373 }, "width": 49, "height": 66, @@ -1140,11 +1140,19 @@ "route": [ { "x": 510, - "y": 360 + "y": 220 + }, + { + "x": 605, + "y": 220 + }, + { + "x": 605, + "y": 317 }, { "x": 700, - "y": 360 + "y": 317 } ], "animated": false, @@ -1178,27 +1186,19 @@ "route": [ { "x": 786, - "y": 475 + "y": 432 }, { - "x": 969, - "y": 475 + "x": 1639, + "y": 432 }, { - "x": 969, - "y": 282 + "x": 1639, + "y": 653.25 }, { - "x": 1559, - "y": 282 - }, - { - "x": 1559, - "y": 522.5 - }, - { - "x": 1658, - "y": 522.5 + "x": 1738, + "y": 653.25 } ], "animated": false, @@ -1232,19 +1232,19 @@ "route": [ { "x": 874, - "y": 95 + "y": 806 }, { - "x": 1019, - "y": 95 + "x": 1104, + "y": 806 }, { - "x": 1019, - "y": 406 + "x": 1104, + "y": 710.5 }, { - "x": 1119, - "y": 406 + "x": 1199, + "y": 710.5 } ], "animated": false, @@ -1278,11 +1278,19 @@ "route": [ { "x": 164, - "y": 479 + "y": 529 + }, + { + "x": 605, + "y": 529 + }, + { + "x": 605, + "y": 432 }, { "x": 733, - "y": 479 + "y": 432 } ], "animated": false, @@ -1316,11 +1324,19 @@ "route": [ { "x": 819, - "y": 587 + "y": 544 + }, + { + "x": 1154, + "y": 544 }, { - "x": 1169, - "y": 533 + "x": 1154, + "y": 891.5 + }, + { + "x": 1249, + "y": 837.5 } ], "animated": false, @@ -1353,20 +1369,20 @@ "labelPercentage": 0, "route": [ { - "x": 1469, - "y": 768 + "x": 1549, + "y": 1072.5 }, { - "x": 1559, - "y": 768 + "x": 1639, + "y": 1072.5 }, { - "x": 1559, - "y": 720.5 + "x": 1639, + "y": 851.25 }, { - "x": 1709, - "y": 720.5 + "x": 1789, + "y": 851.25 } ], "animated": false, @@ -1399,12 +1415,12 @@ "labelPercentage": 0, "route": [ { - "x": 1808, - "y": 522.5 + "x": 1888, + "y": 653.25 }, { - "x": 1992, - "y": 522.5 + "x": 2072, + "y": 653.25 } ], "animated": false, @@ -1437,28 +1453,28 @@ "labelPercentage": 0, "route": [ { - "x": 2043, - "y": 522.5 + "x": 2123, + "y": 653.25 }, { - "x": 2138, - "y": 522.5 + "x": 2218, + "y": 653.25 }, { - "x": 2138, - "y": 956.5 + "x": 2218, + "y": 47 }, { "x": 314, - "y": 956.5 + "y": 47 }, { "x": 314, - "y": 603 + "y": 406 }, { "x": 464, - "y": 603 + "y": 406 } ], "animated": false, diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index 577ddfb1f8..fae220ec1b 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-2944529821 .fill-N1{fill:#0A0F25;} + .d2-2944529821 .fill-N2{fill:#676C7E;} + .d2-2944529821 .fill-N3{fill:#9499AB;} + .d2-2944529821 .fill-N4{fill:#CFD2DD;} + .d2-2944529821 .fill-N5{fill:#DEE1EB;} + .d2-2944529821 .fill-N6{fill:#EEF1F8;} + .d2-2944529821 .fill-N7{fill:#FFFFFF;} + .d2-2944529821 .fill-B1{fill:#0D32B2;} + .d2-2944529821 .fill-B2{fill:#0D32B2;} + .d2-2944529821 .fill-B3{fill:#E3E9FD;} + .d2-2944529821 .fill-B4{fill:#E3E9FD;} + .d2-2944529821 .fill-B5{fill:#EDF0FD;} + .d2-2944529821 .fill-B6{fill:#F7F8FE;} + .d2-2944529821 .fill-AA2{fill:#4A6FF3;} + .d2-2944529821 .fill-AA4{fill:#EDF0FD;} + .d2-2944529821 .fill-AA5{fill:#F7F8FE;} + .d2-2944529821 .fill-AB4{fill:#EDF0FD;} + .d2-2944529821 .fill-AB5{fill:#F7F8FE;} + .d2-2944529821 .stroke-N1{stroke:#0A0F25;} + .d2-2944529821 .stroke-N2{stroke:#676C7E;} + .d2-2944529821 .stroke-N3{stroke:#9499AB;} + .d2-2944529821 .stroke-N4{stroke:#CFD2DD;} + .d2-2944529821 .stroke-N5{stroke:#DEE1EB;} + .d2-2944529821 .stroke-N6{stroke:#EEF1F8;} + .d2-2944529821 .stroke-N7{stroke:#FFFFFF;} + .d2-2944529821 .stroke-B1{stroke:#0D32B2;} + .d2-2944529821 .stroke-B2{stroke:#0D32B2;} + .d2-2944529821 .stroke-B3{stroke:#E3E9FD;} + .d2-2944529821 .stroke-B4{stroke:#E3E9FD;} + .d2-2944529821 .stroke-B5{stroke:#EDF0FD;} + .d2-2944529821 .stroke-B6{stroke:#F7F8FE;} + .d2-2944529821 .stroke-AA2{stroke:#4A6FF3;} + .d2-2944529821 .stroke-AA4{stroke:#EDF0FD;} + .d2-2944529821 .stroke-AA5{stroke:#F7F8FE;} + .d2-2944529821 .stroke-AB4{stroke:#EDF0FD;} + .d2-2944529821 .stroke-AB5{stroke:#F7F8FE;} + .d2-2944529821 .background-color-N1{background-color:#0A0F25;} + .d2-2944529821 .background-color-N2{background-color:#676C7E;} + .d2-2944529821 .background-color-N3{background-color:#9499AB;} + .d2-2944529821 .background-color-N4{background-color:#CFD2DD;} + .d2-2944529821 .background-color-N5{background-color:#DEE1EB;} + .d2-2944529821 .background-color-N6{background-color:#EEF1F8;} + .d2-2944529821 .background-color-N7{background-color:#FFFFFF;} + .d2-2944529821 .background-color-B1{background-color:#0D32B2;} + .d2-2944529821 .background-color-B2{background-color:#0D32B2;} + .d2-2944529821 .background-color-B3{background-color:#E3E9FD;} + .d2-2944529821 .background-color-B4{background-color:#E3E9FD;} + .d2-2944529821 .background-color-B5{background-color:#EDF0FD;} + .d2-2944529821 .background-color-B6{background-color:#F7F8FE;} + .d2-2944529821 .background-color-AA2{background-color:#4A6FF3;} + .d2-2944529821 .background-color-AA4{background-color:#EDF0FD;} + .d2-2944529821 .background-color-AA5{background-color:#F7F8FE;} + .d2-2944529821 .background-color-AB4{background-color:#EDF0FD;} + .d2-2944529821 .background-color-AB5{background-color:#F7F8FE;} + .d2-2944529821 .color-N1{color:#0A0F25;} + .d2-2944529821 .color-N2{color:#676C7E;} + .d2-2944529821 .color-N3{color:#9499AB;} + .d2-2944529821 .color-N4{color:#CFD2DD;} + .d2-2944529821 .color-N5{color:#DEE1EB;} + .d2-2944529821 .color-N6{color:#EEF1F8;} + .d2-2944529821 .color-N7{color:#FFFFFF;} + .d2-2944529821 .color-B1{color:#0D32B2;} + .d2-2944529821 .color-B2{color:#0D32B2;} + .d2-2944529821 .color-B3{color:#E3E9FD;} + .d2-2944529821 .color-B4{color:#E3E9FD;} + .d2-2944529821 .color-B5{color:#EDF0FD;} + .d2-2944529821 .color-B6{color:#F7F8FE;} + .d2-2944529821 .color-AA2{color:#4A6FF3;} + .d2-2944529821 .color-AA4{color:#EDF0FD;} + .d2-2944529821 .color-AA5{color:#F7F8FE;} + .d2-2944529821 .color-AB4{color:#EDF0FD;} + .d2-2944529821 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index d1aca654b5..e83597981f 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "a", "type": "rectangle", "pos": { - "x": 167, - "y": 158 + "x": 320, + "y": 208 }, "width": 53, "height": 66, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 52, - "y": 304 + "x": 206, + "y": 354 }, "width": 280, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 94, - "y": 158 + "x": 393, + "y": 208 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 369, - "y": 550 + "x": 12, + "y": 650 }, "width": 120, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 439, - "y": 1092 + "x": 138, + "y": 1192 }, "width": 120, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 221, - "y": 796 + "x": 172, + "y": 846 }, "width": 80, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 268, - "y": 550 + "x": 151, + "y": 650 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 86, - "y": 550 + "x": 306, + "y": 650 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 213, - "y": 1238 + "x": 260, + "y": 1438 }, "width": 80, "height": 66, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 153, + "x": 282, "y": 12 }, "width": 80, @@ -417,8 +417,8 @@ "id": "k", "type": "rectangle", "pos": { - "x": 226, - "y": 1374 + "x": 273, + "y": 1574 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 569, - "y": 796 + "x": 331, + "y": 846 }, "width": 120, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 517, - "y": 550 + "x": 379, + "y": 650 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 299, - "y": 1092 + "x": 332, + "y": 1192 }, "width": 120, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 12, - "y": 550 + "x": 479, + "y": 650 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 632, - "y": 550 + "x": 553, + "y": 650 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 472, - "y": 1238 + "x": 360, + "y": 1438 }, "width": 54, "height": 66, @@ -727,12 +727,12 @@ "labelPercentage": 0, "route": [ { - "x": 192.16600036621094, - "y": 224 + "x": 346.6659851074219, + "y": 274 }, { - "x": 192.16600036621094, - "y": 304 + "x": 346.6659851074219, + "y": 354 } ], "animated": false, @@ -765,12 +765,12 @@ "labelPercentage": 0, "route": [ { - "x": 122.16600036621094, - "y": 224 + "x": 416.6659851074219, + "y": 274 }, { - "x": 122.16600036621094, - "y": 304 + "x": 416.6659851074219, + "y": 354 } ], "animated": false, @@ -803,20 +803,20 @@ "labelPercentage": 0, "route": [ { - "x": 439.5, - "y": 616 + "x": 42, + "y": 716 }, { - "x": 439.5, - "y": 952 + "x": 42, + "y": 1152 }, { - "x": 499.3330078125, - "y": 952 + "x": 168.16600036621094, + "y": 1152 }, { - "x": 499.3330078125, - "y": 1092 + "x": 168.16600036621094, + "y": 1192 } ], "animated": false, @@ -849,20 +849,12 @@ "labelPercentage": 0, "route": [ { - "x": 275, - "y": 862 + "x": 198.16600036621094, + "y": 912 }, { - "x": 275, - "y": 1002 - }, - { - "x": 469.3330078125, - "y": 1002 - }, - { - "x": 469.3330078125, - "y": 1092 + "x": 198.16600036621094, + "y": 1192 } ], "animated": false, @@ -895,20 +887,28 @@ "labelPercentage": 0, "route": [ { - "x": 227.66600036621094, - "y": 370 + "x": 326.6659851074219, + "y": 420 + }, + { + "x": 326.6659851074219, + "y": 560 }, { - "x": 227.66600036621094, - "y": 656 + "x": 245.99899291992188, + "y": 560 + }, + { + "x": 245.99899291992188, + "y": 756 }, { - "x": 248.33299255371094, - "y": 656 + "x": 225.83299255371094, + "y": 756 }, { - "x": 248.33299255371094, - "y": 796 + "x": 225.83299255371094, + "y": 846 } ], "animated": false, @@ -941,20 +941,20 @@ "labelPercentage": 0, "route": [ { - "x": 252.16600036621094, - "y": 370 + "x": 286.6659851074219, + "y": 420 }, { - "x": 252.16600036621094, - "y": 460 + "x": 286.6659851074219, + "y": 510 }, { - "x": 295.6659851074219, - "y": 460 + "x": 178.99899291992188, + "y": 510 }, { - "x": 295.6659851074219, - "y": 550 + "x": 178.99899291992188, + "y": 650 } ], "animated": false, @@ -987,20 +987,20 @@ "labelPercentage": 0, "route": [ { - "x": 295.6659851074219, - "y": 616 + "x": 178.99899291992188, + "y": 716 }, { - "x": 295.6659851074219, - "y": 656 + "x": 178.99899291992188, + "y": 756 }, { - "x": 275, - "y": 656 + "x": 199.16600036621094, + "y": 756 }, { - "x": 275, - "y": 796 + "x": 199.16600036621094, + "y": 846 } ], "animated": false, @@ -1033,12 +1033,20 @@ "labelPercentage": 0, "route": [ { - "x": 112.5, - "y": 370 + "x": 366.6659851074219, + "y": 420 + }, + { + "x": 366.6659851074219, + "y": 610 }, { - "x": 112.5, - "y": 550 + "x": 333.1659851074219, + "y": 610 + }, + { + "x": 333.1659851074219, + "y": 650 } ], "animated": false, @@ -1071,20 +1079,28 @@ "labelPercentage": 0, "route": [ { - "x": 179, - "y": 370 + "x": 446.6659851074219, + "y": 420 + }, + { + "x": 446.6659851074219, + "y": 460 + }, + { + "x": 646.666015625, + "y": 460 }, { - "x": 179, - "y": 1198 + "x": 646.666015625, + "y": 1348 }, { - "x": 239.66600036621094, - "y": 1198 + "x": 313.5, + "y": 1348 }, { - "x": 239.66600036621094, - "y": 1238 + "x": 313.5, + "y": 1438 } ], "animated": false, @@ -1117,20 +1133,20 @@ "labelPercentage": 0, "route": [ { - "x": 292.1659851074219, - "y": 370 + "x": 246.66600036621094, + "y": 420 }, { - "x": 292.1659851074219, - "y": 410 + "x": 246.66600036621094, + "y": 460 }, { - "x": 429.8330078125, - "y": 410 + "x": 72, + "y": 460 }, { - "x": 429.8330078125, - "y": 550 + "x": 72, + "y": 650 } ], "animated": false, @@ -1163,20 +1179,20 @@ "labelPercentage": 0, "route": [ { - "x": 173.66600036621094, + "x": 342.9159851074219, "y": 78 }, { - "x": 173.66600036621094, + "x": 342.9159851074219, "y": 118 }, { - "x": 120.66600036621094, + "x": 419.6659851074219, "y": 118 }, { - "x": 120.66600036621094, - "y": 158 + "x": 419.6659851074219, + "y": 208 } ], "animated": false, @@ -1209,12 +1225,20 @@ "labelPercentage": 0, "route": [ { - "x": 193.66600036621094, + "x": 322.9159851074219, "y": 78 }, { - "x": 193.66600036621094, - "y": 158 + "x": 322.9159851074219, + "y": 168 + }, + { + "x": 346.6659851074219, + "y": 168 + }, + { + "x": 346.6659851074219, + "y": 208 } ], "animated": false, @@ -1247,19 +1271,19 @@ "labelPercentage": 0, "route": [ { - "x": 262.1659851074219, - "y": 304 + "x": 277.9159851074219, + "y": 354 }, { - "x": 262.1659851074219, + "x": 277.9159851074219, "y": 118 }, { - "x": 213.66600036621094, + "x": 302.9159851074219, "y": 118 }, { - "x": 213.66600036621094, + "x": 302.9159851074219, "y": 78 } ], @@ -1293,12 +1317,12 @@ "labelPercentage": 0, "route": [ { - "x": 253, - "y": 1304 + "x": 300.1659851074219, + "y": 1504 }, { - "x": 253, - "y": 1374 + "x": 300.1659851074219, + "y": 1574 } ], "animated": false, @@ -1331,20 +1355,20 @@ "labelPercentage": 0, "route": [ { - "x": 459.8330078125, - "y": 616 + "x": 102, + "y": 716 }, { - "x": 459.8330078125, - "y": 706 + "x": 102, + "y": 806 }, { - "x": 599.8330078125, - "y": 706 + "x": 361.1659851074219, + "y": 806 }, { - "x": 599.8330078125, - "y": 796 + "x": 361.1659851074219, + "y": 846 } ], "animated": false, @@ -1377,20 +1401,20 @@ "labelPercentage": 0, "route": [ { - "x": 629.8330078125, - "y": 862 + "x": 376.75, + "y": 912 }, { - "x": 629.8330078125, - "y": 952 + "x": 376.75, + "y": 1052 }, { - "x": 529.3330078125, - "y": 952 + "x": 228.16600036621094, + "y": 1052 }, { - "x": 529.3330078125, - "y": 1092 + "x": 228.16600036621094, + "y": 1192 } ], "animated": false, @@ -1423,20 +1447,20 @@ "labelPercentage": 0, "route": [ { - "x": 570.3330078125, - "y": 616 + "x": 406.3330078125, + "y": 716 }, { - "x": 570.3330078125, - "y": 656 + "x": 406.3330078125, + "y": 756 }, { - "x": 629.8330078125, - "y": 656 + "x": 391.1659851074219, + "y": 756 }, { - "x": 629.8330078125, - "y": 796 + "x": 391.1659851074219, + "y": 846 } ], "animated": false, @@ -1469,20 +1493,28 @@ "labelPercentage": 0, "route": [ { - "x": 543.666015625, - "y": 616 + "x": 432.9989929199219, + "y": 716 }, { - "x": 543.666015625, + "x": 432.9989929199219, "y": 756 }, { - "x": 389.3330078125, + "x": 511.1659851074219, "y": 756 }, { - "x": 389.3330078125, - "y": 1092 + "x": 511.1659851074219, + "y": 952 + }, + { + "x": 422.3330078125, + "y": 952 + }, + { + "x": 422.3330078125, + "y": 1192 } ], "animated": false, @@ -1515,20 +1547,20 @@ "labelPercentage": 0, "route": [ { - "x": 359.3330078125, - "y": 1158 + "x": 392.3330078125, + "y": 1258 }, { - "x": 359.3330078125, - "y": 1198 + "x": 392.3330078125, + "y": 1298 }, { - "x": 266.3330078125, - "y": 1198 + "x": 286.8330078125, + "y": 1298 }, { - "x": 266.3330078125, - "y": 1238 + "x": 286.8330078125, + "y": 1438 } ], "animated": false, @@ -1561,20 +1593,20 @@ "labelPercentage": 0, "route": [ { - "x": 399.8330078125, - "y": 616 + "x": 72, + "y": 716 }, { - "x": 399.8330078125, - "y": 656 + "x": 72, + "y": 1102 }, { - "x": 356.3330078125, - "y": 656 + "x": 362.3330078125, + "y": 1102 }, { - "x": 356.3330078125, - "y": 1092 + "x": 362.3330078125, + "y": 1192 } ], "animated": false, @@ -1607,20 +1639,20 @@ "labelPercentage": 0, "route": [ { - "x": 248.33299255371094, - "y": 862 + "x": 225.83299255371094, + "y": 912 }, { - "x": 248.33299255371094, - "y": 1052 + "x": 225.83299255371094, + "y": 1002 }, { - "x": 329.3330078125, - "y": 1052 + "x": 392.3330078125, + "y": 1002 }, { - "x": 329.3330078125, - "y": 1092 + "x": 392.3330078125, + "y": 1192 } ], "animated": false, @@ -1653,20 +1685,20 @@ "labelPercentage": 0, "route": [ { - "x": 92.16600036621094, - "y": 370 + "x": 406.6659851074219, + "y": 420 }, { - "x": 92.16600036621094, - "y": 410 + "x": 406.6659851074219, + "y": 510 }, { - "x": 39, - "y": 410 + "x": 506.6659851074219, + "y": 510 }, { - "x": 39, - "y": 550 + "x": 506.6659851074219, + "y": 650 } ], "animated": false, @@ -1699,12 +1731,20 @@ "labelPercentage": 0, "route": [ { - "x": 659.8330078125, - "y": 616 + "x": 580.166015625, + "y": 716 }, { - "x": 659.8330078125, - "y": 796 + "x": 580.166015625, + "y": 806 + }, + { + "x": 421.1659851074219, + "y": 806 + }, + { + "x": 421.1659851074219, + "y": 846 } ], "animated": false, @@ -1737,12 +1777,20 @@ "labelPercentage": 0, "route": [ { - "x": 499.3330078125, - "y": 1158 + "x": 198.16600036621094, + "y": 1258 + }, + { + "x": 198.16600036621094, + "y": 1398 + }, + { + "x": 387.1659851074219, + "y": 1398 }, { - "x": 499.3330078125, - "y": 1238 + "x": 387.1659851074219, + "y": 1438 } ], "animated": false, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index f54e7ffea0..6382b0a168 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq - - - - - - - - - - - - - - - - - - + .d2-1632408342 .fill-N1{fill:#0A0F25;} + .d2-1632408342 .fill-N2{fill:#676C7E;} + .d2-1632408342 .fill-N3{fill:#9499AB;} + .d2-1632408342 .fill-N4{fill:#CFD2DD;} + .d2-1632408342 .fill-N5{fill:#DEE1EB;} + .d2-1632408342 .fill-N6{fill:#EEF1F8;} + .d2-1632408342 .fill-N7{fill:#FFFFFF;} + .d2-1632408342 .fill-B1{fill:#0D32B2;} + .d2-1632408342 .fill-B2{fill:#0D32B2;} + .d2-1632408342 .fill-B3{fill:#E3E9FD;} + .d2-1632408342 .fill-B4{fill:#E3E9FD;} + .d2-1632408342 .fill-B5{fill:#EDF0FD;} + .d2-1632408342 .fill-B6{fill:#F7F8FE;} + .d2-1632408342 .fill-AA2{fill:#4A6FF3;} + .d2-1632408342 .fill-AA4{fill:#EDF0FD;} + .d2-1632408342 .fill-AA5{fill:#F7F8FE;} + .d2-1632408342 .fill-AB4{fill:#EDF0FD;} + .d2-1632408342 .fill-AB5{fill:#F7F8FE;} + .d2-1632408342 .stroke-N1{stroke:#0A0F25;} + .d2-1632408342 .stroke-N2{stroke:#676C7E;} + .d2-1632408342 .stroke-N3{stroke:#9499AB;} + .d2-1632408342 .stroke-N4{stroke:#CFD2DD;} + .d2-1632408342 .stroke-N5{stroke:#DEE1EB;} + .d2-1632408342 .stroke-N6{stroke:#EEF1F8;} + .d2-1632408342 .stroke-N7{stroke:#FFFFFF;} + .d2-1632408342 .stroke-B1{stroke:#0D32B2;} + .d2-1632408342 .stroke-B2{stroke:#0D32B2;} + .d2-1632408342 .stroke-B3{stroke:#E3E9FD;} + .d2-1632408342 .stroke-B4{stroke:#E3E9FD;} + .d2-1632408342 .stroke-B5{stroke:#EDF0FD;} + .d2-1632408342 .stroke-B6{stroke:#F7F8FE;} + .d2-1632408342 .stroke-AA2{stroke:#4A6FF3;} + .d2-1632408342 .stroke-AA4{stroke:#EDF0FD;} + .d2-1632408342 .stroke-AA5{stroke:#F7F8FE;} + .d2-1632408342 .stroke-AB4{stroke:#EDF0FD;} + .d2-1632408342 .stroke-AB5{stroke:#F7F8FE;} + .d2-1632408342 .background-color-N1{background-color:#0A0F25;} + .d2-1632408342 .background-color-N2{background-color:#676C7E;} + .d2-1632408342 .background-color-N3{background-color:#9499AB;} + .d2-1632408342 .background-color-N4{background-color:#CFD2DD;} + .d2-1632408342 .background-color-N5{background-color:#DEE1EB;} + .d2-1632408342 .background-color-N6{background-color:#EEF1F8;} + .d2-1632408342 .background-color-N7{background-color:#FFFFFF;} + .d2-1632408342 .background-color-B1{background-color:#0D32B2;} + .d2-1632408342 .background-color-B2{background-color:#0D32B2;} + .d2-1632408342 .background-color-B3{background-color:#E3E9FD;} + .d2-1632408342 .background-color-B4{background-color:#E3E9FD;} + .d2-1632408342 .background-color-B5{background-color:#EDF0FD;} + .d2-1632408342 .background-color-B6{background-color:#F7F8FE;} + .d2-1632408342 .background-color-AA2{background-color:#4A6FF3;} + .d2-1632408342 .background-color-AA4{background-color:#EDF0FD;} + .d2-1632408342 .background-color-AA5{background-color:#F7F8FE;} + .d2-1632408342 .background-color-AB4{background-color:#EDF0FD;} + .d2-1632408342 .background-color-AB5{background-color:#F7F8FE;} + .d2-1632408342 .color-N1{color:#0A0F25;} + .d2-1632408342 .color-N2{color:#676C7E;} + .d2-1632408342 .color-N3{color:#9499AB;} + .d2-1632408342 .color-N4{color:#CFD2DD;} + .d2-1632408342 .color-N5{color:#DEE1EB;} + .d2-1632408342 .color-N6{color:#EEF1F8;} + .d2-1632408342 .color-N7{color:#FFFFFF;} + .d2-1632408342 .color-B1{color:#0D32B2;} + .d2-1632408342 .color-B2{color:#0D32B2;} + .d2-1632408342 .color-B3{color:#E3E9FD;} + .d2-1632408342 .color-B4{color:#E3E9FD;} + .d2-1632408342 .color-B5{color:#EDF0FD;} + .d2-1632408342 .color-B6{color:#F7F8FE;} + .d2-1632408342 .color-AA2{color:#4A6FF3;} + .d2-1632408342 .color-AA4{color:#EDF0FD;} + .d2-1632408342 .color-AA5{color:#F7F8FE;} + .d2-1632408342 .color-AB4{color:#EDF0FD;} + .d2-1632408342 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopq + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index 0256134d03..0aef49b634 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 199, + "x": 99, "y": 530 }, "width": 120, @@ -48,8 +48,8 @@ "id": "tree", "type": "rectangle", "pos": { - "x": 64, - "y": 676 + "x": 16, + "y": 726 }, "width": 80, "height": 66, @@ -89,8 +89,8 @@ "id": "and", "type": "rectangle", "pos": { - "x": 223, - "y": 676 + "x": 116, + "y": 726 }, "width": 72, "height": 66, @@ -130,8 +130,8 @@ "id": "nodes", "type": "rectangle", "pos": { - "x": 315, - "y": 676 + "x": 208, + "y": 726 }, "width": 87, "height": 66, @@ -171,8 +171,8 @@ "id": "some", "type": "rectangle", "pos": { - "x": 218, - "y": 822 + "x": 12, + "y": 972 }, "width": 83, "height": 66, @@ -212,8 +212,8 @@ "id": "more", "type": "rectangle", "pos": { - "x": 12, - "y": 822 + "x": 115, + "y": 972 }, "width": 81, "height": 66, @@ -253,8 +253,8 @@ "id": "many", "type": "rectangle", "pos": { - "x": 113, - "y": 822 + "x": 216, + "y": 972 }, "width": 85, "height": 66, @@ -294,7 +294,7 @@ "id": "then", "type": "rectangle", "pos": { - "x": 433, + "x": 377, "y": 530 }, "width": 80, @@ -335,8 +335,8 @@ "id": "here", "type": "rectangle", "pos": { - "x": 422, - "y": 676 + "x": 366, + "y": 726 }, "width": 76, "height": 66, @@ -376,8 +376,8 @@ "id": "you", "type": "rectangle", "pos": { - "x": 424, - "y": 822 + "x": 368, + "y": 972 }, "width": 72, "height": 66, @@ -417,7 +417,7 @@ "id": "have", "type": "rectangle", "pos": { - "x": 554, + "x": 498, "y": 530 }, "width": 78, @@ -458,8 +458,8 @@ "id": "hierarchy", "type": "rectangle", "pos": { - "x": 518, - "y": 676 + "x": 462, + "y": 726 }, "width": 113, "height": 66, @@ -499,7 +499,7 @@ "id": "finally", "type": "rectangle", "pos": { - "x": 652, + "x": 596, "y": 12 }, "width": 289, @@ -540,8 +540,8 @@ "id": "another", "type": "rectangle", "pos": { - "x": 697, - "y": 676 + "x": 641, + "y": 726 }, "width": 103, "height": 66, @@ -581,8 +581,8 @@ "id": "of", "type": "rectangle", "pos": { - "x": 719, - "y": 822 + "x": 662, + "y": 972 }, "width": 60, "height": 66, @@ -622,7 +622,7 @@ "id": "nesting", "type": "rectangle", "pos": { - "x": 961, + "x": 905, "y": 530 }, "width": 98, @@ -663,8 +663,8 @@ "id": "trees", "type": "rectangle", "pos": { - "x": 955, - "y": 676 + "x": 899, + "y": 726 }, "width": 82, "height": 66, @@ -704,7 +704,7 @@ "id": "finally.a", "type": "rectangle", "pos": { - "x": 766, + "x": 710, "y": 198 }, "width": 80, @@ -745,7 +745,7 @@ "id": "finally.tree", "type": "rectangle", "pos": { - "x": 722, + "x": 666, "y": 344 }, "width": 74, @@ -786,7 +786,7 @@ "id": "finally.inside", "type": "rectangle", "pos": { - "x": 762, + "x": 706, "y": 62 }, "width": 88, @@ -827,7 +827,7 @@ "id": "finally.hierarchy", "type": "rectangle", "pos": { - "x": 702, + "x": 646, "y": 480 }, "width": 113, @@ -868,7 +868,7 @@ "id": "finally.root", "type": "rectangle", "pos": { - "x": 816, + "x": 760, "y": 344 }, "width": 75, @@ -932,20 +932,20 @@ "labelPercentage": 0, "route": [ { - "x": 229.5, + "x": 129.16600036621094, "y": 596 }, { - "x": 229.5, + "x": 129.16600036621094, "y": 636 }, { - "x": 104, + "x": 56, "y": 636 }, { - "x": 104, - "y": 676 + "x": 56, + "y": 726 } ], "animated": false, @@ -978,12 +978,12 @@ "labelPercentage": 0, "route": [ { - "x": 259.5, + "x": 152, "y": 596 }, { - "x": 259.5, - "y": 676 + "x": 152, + "y": 726 } ], "animated": false, @@ -1016,20 +1016,20 @@ "labelPercentage": 0, "route": [ { - "x": 289.5, + "x": 189.16600036621094, "y": 596 }, { - "x": 289.5, + "x": 189.16600036621094, "y": 636 }, { - "x": 359, + "x": 251.5, "y": 636 }, { - "x": 359, - "y": 676 + "x": 251.5, + "y": 726 } ], "animated": false, @@ -1062,12 +1062,20 @@ "labelPercentage": 0, "route": [ { - "x": 259.5, - "y": 742 + "x": 152, + "y": 792 + }, + { + "x": 152, + "y": 882 + }, + { + "x": 53.5, + "y": 882 }, { - "x": 259.5, - "y": 822 + "x": 53.5, + "y": 972 } ], "animated": false, @@ -1100,20 +1108,20 @@ "labelPercentage": 0, "route": [ { - "x": 90.66600036621094, - "y": 742 + "x": 42.66600036621094, + "y": 792 }, { - "x": 90.66600036621094, - "y": 782 + "x": 42.66600036621094, + "y": 932 }, { - "x": 52.5, - "y": 782 + "x": 155.5, + "y": 932 }, { - "x": 52.5, - "y": 822 + "x": 155.5, + "y": 972 } ], "animated": false, @@ -1146,20 +1154,20 @@ "labelPercentage": 0, "route": [ { - "x": 117.33300018310547, - "y": 742 + "x": 69.33300018310547, + "y": 792 }, { - "x": 117.33300018310547, - "y": 782 + "x": 69.33300018310547, + "y": 832 }, { - "x": 155.5, - "y": 782 + "x": 258.5, + "y": 832 }, { - "x": 155.5, - "y": 822 + "x": 258.5, + "y": 972 } ], "animated": false, @@ -1192,12 +1200,12 @@ "labelPercentage": 0, "route": [ { - "x": 460.5, + "x": 404.25, "y": 596 }, { - "x": 460.5, - "y": 676 + "x": 404.25, + "y": 726 } ], "animated": false, @@ -1230,12 +1238,12 @@ "labelPercentage": 0, "route": [ { - "x": 460.5, - "y": 742 + "x": 404.25, + "y": 792 }, { - "x": 460.5, - "y": 822 + "x": 404.25, + "y": 972 } ], "animated": false, @@ -1268,12 +1276,12 @@ "labelPercentage": 0, "route": [ { - "x": 593.8330078125, + "x": 537.5830078125, "y": 596 }, { - "x": 593.8330078125, - "y": 676 + "x": 537.5830078125, + "y": 726 } ], "animated": false, @@ -1306,20 +1314,20 @@ "labelPercentage": 0, "route": [ { - "x": 487.1659851074219, + "x": 430.9159851074219, "y": 596 }, { - "x": 487.1659851074219, + "x": 430.9159851074219, "y": 636 }, { - "x": 556.166015625, + "x": 499.9159851074219, "y": 636 }, { - "x": 556.166015625, - "y": 676 + "x": 499.9159851074219, + "y": 726 } ], "animated": false, @@ -1352,12 +1360,12 @@ "labelPercentage": 0, "route": [ { - "x": 749, + "x": 692.75, "y": 596 }, { - "x": 749, - "y": 676 + "x": 692.75, + "y": 726 } ], "animated": false, @@ -1390,12 +1398,12 @@ "labelPercentage": 0, "route": [ { - "x": 749, - "y": 742 + "x": 692.75, + "y": 792 }, { - "x": 749, - "y": 822 + "x": 692.75, + "y": 972 } ], "animated": false, @@ -1428,12 +1436,12 @@ "labelPercentage": 0, "route": [ { - "x": 1010.3330078125, + "x": 954.0830078125, "y": 596 }, { - "x": 1010.3330078125, - "y": 676 + "x": 954.0830078125, + "y": 726 } ], "animated": false, @@ -1466,20 +1474,20 @@ "labelPercentage": 0, "route": [ { - "x": 845.166015625, + "x": 788.916015625, "y": 596 }, { - "x": 845.166015625, + "x": 788.916015625, "y": 636 }, { - "x": 983, + "x": 926.75, "y": 636 }, { - "x": 983, - "y": 676 + "x": 926.75, + "y": 726 } ], "animated": false, @@ -1512,19 +1520,19 @@ "labelPercentage": 0, "route": [ { - "x": 793.25, + "x": 737, "y": 264 }, { - "x": 793.25, + "x": 737, "y": 304 }, { - "x": 759.3330078125, + "x": 703.0830078125, "y": 304 }, { - "x": 759.3330078125, + "x": 703.0830078125, "y": 344 } ], @@ -1558,11 +1566,11 @@ "labelPercentage": 0, "route": [ { - "x": 806.5830078125, + "x": 750.3330078125, "y": 128 }, { - "x": 806.5830078125, + "x": 750.3330078125, "y": 198 } ], @@ -1596,11 +1604,11 @@ "labelPercentage": 0, "route": [ { - "x": 759.3330078125, + "x": 703.0830078125, "y": 410 }, { - "x": 759.3330078125, + "x": 703.0830078125, "y": 480 } ], @@ -1634,19 +1642,19 @@ "labelPercentage": 0, "route": [ { - "x": 819.916015625, + "x": 763.666015625, "y": 264 }, { - "x": 819.916015625, + "x": 763.666015625, "y": 304 }, { - "x": 853.8330078125, + "x": 797.5830078125, "y": 304 }, { - "x": 853.8330078125, + "x": 797.5830078125, "y": 344 } ], diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index ef0f8eb4f5..9b48a9dfc0 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - - - - - - - - - - - - - - - - - - - - - - - + .d2-1701423525 .fill-N1{fill:#0A0F25;} + .d2-1701423525 .fill-N2{fill:#676C7E;} + .d2-1701423525 .fill-N3{fill:#9499AB;} + .d2-1701423525 .fill-N4{fill:#CFD2DD;} + .d2-1701423525 .fill-N5{fill:#DEE1EB;} + .d2-1701423525 .fill-N6{fill:#EEF1F8;} + .d2-1701423525 .fill-N7{fill:#FFFFFF;} + .d2-1701423525 .fill-B1{fill:#0D32B2;} + .d2-1701423525 .fill-B2{fill:#0D32B2;} + .d2-1701423525 .fill-B3{fill:#E3E9FD;} + .d2-1701423525 .fill-B4{fill:#E3E9FD;} + .d2-1701423525 .fill-B5{fill:#EDF0FD;} + .d2-1701423525 .fill-B6{fill:#F7F8FE;} + .d2-1701423525 .fill-AA2{fill:#4A6FF3;} + .d2-1701423525 .fill-AA4{fill:#EDF0FD;} + .d2-1701423525 .fill-AA5{fill:#F7F8FE;} + .d2-1701423525 .fill-AB4{fill:#EDF0FD;} + .d2-1701423525 .fill-AB5{fill:#F7F8FE;} + .d2-1701423525 .stroke-N1{stroke:#0A0F25;} + .d2-1701423525 .stroke-N2{stroke:#676C7E;} + .d2-1701423525 .stroke-N3{stroke:#9499AB;} + .d2-1701423525 .stroke-N4{stroke:#CFD2DD;} + .d2-1701423525 .stroke-N5{stroke:#DEE1EB;} + .d2-1701423525 .stroke-N6{stroke:#EEF1F8;} + .d2-1701423525 .stroke-N7{stroke:#FFFFFF;} + .d2-1701423525 .stroke-B1{stroke:#0D32B2;} + .d2-1701423525 .stroke-B2{stroke:#0D32B2;} + .d2-1701423525 .stroke-B3{stroke:#E3E9FD;} + .d2-1701423525 .stroke-B4{stroke:#E3E9FD;} + .d2-1701423525 .stroke-B5{stroke:#EDF0FD;} + .d2-1701423525 .stroke-B6{stroke:#F7F8FE;} + .d2-1701423525 .stroke-AA2{stroke:#4A6FF3;} + .d2-1701423525 .stroke-AA4{stroke:#EDF0FD;} + .d2-1701423525 .stroke-AA5{stroke:#F7F8FE;} + .d2-1701423525 .stroke-AB4{stroke:#EDF0FD;} + .d2-1701423525 .stroke-AB5{stroke:#F7F8FE;} + .d2-1701423525 .background-color-N1{background-color:#0A0F25;} + .d2-1701423525 .background-color-N2{background-color:#676C7E;} + .d2-1701423525 .background-color-N3{background-color:#9499AB;} + .d2-1701423525 .background-color-N4{background-color:#CFD2DD;} + .d2-1701423525 .background-color-N5{background-color:#DEE1EB;} + .d2-1701423525 .background-color-N6{background-color:#EEF1F8;} + .d2-1701423525 .background-color-N7{background-color:#FFFFFF;} + .d2-1701423525 .background-color-B1{background-color:#0D32B2;} + .d2-1701423525 .background-color-B2{background-color:#0D32B2;} + .d2-1701423525 .background-color-B3{background-color:#E3E9FD;} + .d2-1701423525 .background-color-B4{background-color:#E3E9FD;} + .d2-1701423525 .background-color-B5{background-color:#EDF0FD;} + .d2-1701423525 .background-color-B6{background-color:#F7F8FE;} + .d2-1701423525 .background-color-AA2{background-color:#4A6FF3;} + .d2-1701423525 .background-color-AA4{background-color:#EDF0FD;} + .d2-1701423525 .background-color-AA5{background-color:#F7F8FE;} + .d2-1701423525 .background-color-AB4{background-color:#EDF0FD;} + .d2-1701423525 .background-color-AB5{background-color:#F7F8FE;} + .d2-1701423525 .color-N1{color:#0A0F25;} + .d2-1701423525 .color-N2{color:#676C7E;} + .d2-1701423525 .color-N3{color:#9499AB;} + .d2-1701423525 .color-N4{color:#CFD2DD;} + .d2-1701423525 .color-N5{color:#DEE1EB;} + .d2-1701423525 .color-N6{color:#EEF1F8;} + .d2-1701423525 .color-N7{color:#FFFFFF;} + .d2-1701423525 .color-B1{color:#0D32B2;} + .d2-1701423525 .color-B2{color:#0D32B2;} + .d2-1701423525 .color-B3{color:#E3E9FD;} + .d2-1701423525 .color-B4{color:#E3E9FD;} + .d2-1701423525 .color-B5{color:#EDF0FD;} + .d2-1701423525 .color-B6{color:#F7F8FE;} + .d2-1701423525 .color-AA2{color:#4A6FF3;} + .d2-1701423525 .color-AA4{color:#EDF0FD;} + .d2-1701423525 .color-AA5{color:#F7F8FE;} + .d2-1701423525 .color-AB4{color:#EDF0FD;} + .d2-1701423525 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json b/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json index 2bbc003895..0fdcebe7a2 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json +++ b/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "student", "type": "rectangle", "pos": { - "x": 96, + "x": 138, "y": 12 }, "width": 100, @@ -48,7 +48,7 @@ "id": "committee chair", "type": "rectangle", "pos": { - "x": 65, + "x": 107, "y": 259 }, "width": 162, @@ -89,7 +89,7 @@ "id": "committee", "type": "rectangle", "pos": { - "x": 85, + "x": 127, "y": 486 }, "width": 122, @@ -153,27 +153,27 @@ "labelPercentage": 0, "route": [ { - "x": 130.08299255371094, + "x": 204.91600036621094, "y": 78 }, { - "x": 130.08299255371094, + "x": 204.91600036621094, "y": 118 }, { - "x": 66.5, + "x": 268.5, "y": 118 }, { - "x": 66.5, + "x": 268.5, "y": 219 }, { - "x": 119.75, + "x": 215.25, "y": 219 }, { - "x": 119.75, + "x": 215.25, "y": 259 } ], @@ -207,27 +207,27 @@ "labelPercentage": 0, "route": [ { - "x": 163.41600036621094, + "x": 171.58299255371094, "y": 78 }, { - "x": 163.41600036621094, + "x": 171.58299255371094, "y": 118 }, { - "x": 227, + "x": 108, "y": 118 }, { - "x": 227, + "x": 108, "y": 219 }, { - "x": 173.75, + "x": 161.25, "y": 219 }, { - "x": 173.75, + "x": 161.25, "y": 259 } ], @@ -261,11 +261,11 @@ "labelPercentage": 0, "route": [ { - "x": 146.75, + "x": 188.25, "y": 325 }, { - "x": 146.75, + "x": 188.25, "y": 486 } ], diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg index 1493393f8b..93a0a117b1 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-108752816 .fill-N1{fill:#0A0F25;} + .d2-108752816 .fill-N2{fill:#676C7E;} + .d2-108752816 .fill-N3{fill:#9499AB;} + .d2-108752816 .fill-N4{fill:#CFD2DD;} + .d2-108752816 .fill-N5{fill:#DEE1EB;} + .d2-108752816 .fill-N6{fill:#EEF1F8;} + .d2-108752816 .fill-N7{fill:#FFFFFF;} + .d2-108752816 .fill-B1{fill:#0D32B2;} + .d2-108752816 .fill-B2{fill:#0D32B2;} + .d2-108752816 .fill-B3{fill:#E3E9FD;} + .d2-108752816 .fill-B4{fill:#E3E9FD;} + .d2-108752816 .fill-B5{fill:#EDF0FD;} + .d2-108752816 .fill-B6{fill:#F7F8FE;} + .d2-108752816 .fill-AA2{fill:#4A6FF3;} + .d2-108752816 .fill-AA4{fill:#EDF0FD;} + .d2-108752816 .fill-AA5{fill:#F7F8FE;} + .d2-108752816 .fill-AB4{fill:#EDF0FD;} + .d2-108752816 .fill-AB5{fill:#F7F8FE;} + .d2-108752816 .stroke-N1{stroke:#0A0F25;} + .d2-108752816 .stroke-N2{stroke:#676C7E;} + .d2-108752816 .stroke-N3{stroke:#9499AB;} + .d2-108752816 .stroke-N4{stroke:#CFD2DD;} + .d2-108752816 .stroke-N5{stroke:#DEE1EB;} + .d2-108752816 .stroke-N6{stroke:#EEF1F8;} + .d2-108752816 .stroke-N7{stroke:#FFFFFF;} + .d2-108752816 .stroke-B1{stroke:#0D32B2;} + .d2-108752816 .stroke-B2{stroke:#0D32B2;} + .d2-108752816 .stroke-B3{stroke:#E3E9FD;} + .d2-108752816 .stroke-B4{stroke:#E3E9FD;} + .d2-108752816 .stroke-B5{stroke:#EDF0FD;} + .d2-108752816 .stroke-B6{stroke:#F7F8FE;} + .d2-108752816 .stroke-AA2{stroke:#4A6FF3;} + .d2-108752816 .stroke-AA4{stroke:#EDF0FD;} + .d2-108752816 .stroke-AA5{stroke:#F7F8FE;} + .d2-108752816 .stroke-AB4{stroke:#EDF0FD;} + .d2-108752816 .stroke-AB5{stroke:#F7F8FE;} + .d2-108752816 .background-color-N1{background-color:#0A0F25;} + .d2-108752816 .background-color-N2{background-color:#676C7E;} + .d2-108752816 .background-color-N3{background-color:#9499AB;} + .d2-108752816 .background-color-N4{background-color:#CFD2DD;} + .d2-108752816 .background-color-N5{background-color:#DEE1EB;} + .d2-108752816 .background-color-N6{background-color:#EEF1F8;} + .d2-108752816 .background-color-N7{background-color:#FFFFFF;} + .d2-108752816 .background-color-B1{background-color:#0D32B2;} + .d2-108752816 .background-color-B2{background-color:#0D32B2;} + .d2-108752816 .background-color-B3{background-color:#E3E9FD;} + .d2-108752816 .background-color-B4{background-color:#E3E9FD;} + .d2-108752816 .background-color-B5{background-color:#EDF0FD;} + .d2-108752816 .background-color-B6{background-color:#F7F8FE;} + .d2-108752816 .background-color-AA2{background-color:#4A6FF3;} + .d2-108752816 .background-color-AA4{background-color:#EDF0FD;} + .d2-108752816 .background-color-AA5{background-color:#F7F8FE;} + .d2-108752816 .background-color-AB4{background-color:#EDF0FD;} + .d2-108752816 .background-color-AB5{background-color:#F7F8FE;} + .d2-108752816 .color-N1{color:#0A0F25;} + .d2-108752816 .color-N2{color:#676C7E;} + .d2-108752816 .color-N3{color:#9499AB;} + .d2-108752816 .color-N4{color:#CFD2DD;} + .d2-108752816 .color-N5{color:#DEE1EB;} + .d2-108752816 .color-N6{color:#EEF1F8;} + .d2-108752816 .color-N7{color:#FFFFFF;} + .d2-108752816 .color-B1{color:#0D32B2;} + .d2-108752816 .color-B2{color:#0D32B2;} + .d2-108752816 .color-B3{color:#E3E9FD;} + .d2-108752816 .color-B4{color:#E3E9FD;} + .d2-108752816 .color-B5{color:#EDF0FD;} + .d2-108752816 .color-B6{color:#F7F8FE;} + .d2-108752816 .color-AA2{color:#4A6FF3;} + .d2-108752816 .color-AA4{color:#EDF0FD;} + .d2-108752816 .color-AA5{color:#F7F8FE;} + .d2-108752816 .color-AB4{color:#EDF0FD;} + .d2-108752816 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index 498bfb7067..15fc39c54a 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "sql_table", "pos": { "x": 72, - "y": 198 + "y": 281 }, "width": 201, "height": 280, @@ -142,7 +142,7 @@ "type": "sql_table", "pos": { "x": 571, - "y": 1406 + "y": 240 }, "width": 194, "height": 108, @@ -246,7 +246,7 @@ "type": "sql_table", "pos": { "x": 571, - "y": 618 + "y": 368 }, "width": 194, "height": 108, @@ -350,7 +350,7 @@ "type": "sql_table", "pos": { "x": 557, - "y": 1182 + "y": 701 }, "width": 222, "height": 144, @@ -482,7 +482,7 @@ "type": "sql_table", "pos": { "x": 595, - "y": 806 + "y": 865 }, "width": 146, "height": 108, @@ -584,7 +584,7 @@ "type": "sql_table", "pos": { "x": 514, - "y": 994 + "y": 993 }, "width": 308, "height": 108, @@ -709,27 +709,27 @@ "route": [ { "x": 97.125, - "y": 478 + "y": 561 }, { "x": 97.125, - "y": 528 + "y": 611 }, { "x": 22, - "y": 528 + "y": 611 }, { "x": 22, - "y": 148 + "y": 231 }, { "x": 139, - "y": 148 + "y": 231 }, { "x": 139, - "y": 198 + "y": 281 } ], "animated": false, @@ -763,27 +763,27 @@ "route": [ { "x": 122.25, - "y": 478 + "y": 561 }, { "x": 122.25, - "y": 538 + "y": 621 }, { "x": 12, - "y": 538 + "y": 621 }, { "x": 12, - "y": 99 + "y": 182 }, { "x": 206, - "y": 99 + "y": 182 }, { "x": 206, - "y": 198 + "y": 281 } ], "animated": false, @@ -817,19 +817,19 @@ "route": [ { "x": 147.375, - "y": 478 + "y": 561 }, { "x": 147.375, - "y": 1366 + "y": 1173 }, { "x": 668, - "y": 1366 + "y": 1173 }, { "x": 668, - "y": 1406 + "y": 348 } ], "animated": false, @@ -863,19 +863,19 @@ "route": [ { "x": 172.5, - "y": 478 + "y": 561 }, { "x": 172.5, - "y": 578 + "y": 661 }, { "x": 668, - "y": 578 + "y": 661 }, { "x": 668, - "y": 618 + "y": 476 } ], "animated": false, @@ -909,19 +909,19 @@ "route": [ { "x": 197.625, - "y": 478 + "y": 561 }, { "x": 197.625, - "y": 1142 + "y": 1141 }, { "x": 668, - "y": 1142 + "y": 1141 }, { "x": 668, - "y": 1182 + "y": 845 } ], "animated": false, @@ -955,19 +955,19 @@ "route": [ { "x": 222.75, - "y": 478 + "y": 281 }, { "x": 222.75, - "y": 766 + "y": 55 }, { "x": 668, - "y": 766 + "y": 55 }, { "x": 668, - "y": 806 + "y": 865 } ], "animated": false, @@ -1001,19 +1001,19 @@ "route": [ { "x": 247.875, - "y": 478 + "y": 281 }, { "x": 247.875, - "y": 954 + "y": 23 }, { "x": 668, - "y": 954 + "y": 23 }, { "x": 668, - "y": 994 + "y": 993 } ], "animated": false, diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 3e7f1a8bd7..191c6dbcda 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - - + .d2-2208838362 .fill-N1{fill:#0A0F25;} + .d2-2208838362 .fill-N2{fill:#676C7E;} + .d2-2208838362 .fill-N3{fill:#9499AB;} + .d2-2208838362 .fill-N4{fill:#CFD2DD;} + .d2-2208838362 .fill-N5{fill:#DEE1EB;} + .d2-2208838362 .fill-N6{fill:#EEF1F8;} + .d2-2208838362 .fill-N7{fill:#FFFFFF;} + .d2-2208838362 .fill-B1{fill:#0D32B2;} + .d2-2208838362 .fill-B2{fill:#0D32B2;} + .d2-2208838362 .fill-B3{fill:#E3E9FD;} + .d2-2208838362 .fill-B4{fill:#E3E9FD;} + .d2-2208838362 .fill-B5{fill:#EDF0FD;} + .d2-2208838362 .fill-B6{fill:#F7F8FE;} + .d2-2208838362 .fill-AA2{fill:#4A6FF3;} + .d2-2208838362 .fill-AA4{fill:#EDF0FD;} + .d2-2208838362 .fill-AA5{fill:#F7F8FE;} + .d2-2208838362 .fill-AB4{fill:#EDF0FD;} + .d2-2208838362 .fill-AB5{fill:#F7F8FE;} + .d2-2208838362 .stroke-N1{stroke:#0A0F25;} + .d2-2208838362 .stroke-N2{stroke:#676C7E;} + .d2-2208838362 .stroke-N3{stroke:#9499AB;} + .d2-2208838362 .stroke-N4{stroke:#CFD2DD;} + .d2-2208838362 .stroke-N5{stroke:#DEE1EB;} + .d2-2208838362 .stroke-N6{stroke:#EEF1F8;} + .d2-2208838362 .stroke-N7{stroke:#FFFFFF;} + .d2-2208838362 .stroke-B1{stroke:#0D32B2;} + .d2-2208838362 .stroke-B2{stroke:#0D32B2;} + .d2-2208838362 .stroke-B3{stroke:#E3E9FD;} + .d2-2208838362 .stroke-B4{stroke:#E3E9FD;} + .d2-2208838362 .stroke-B5{stroke:#EDF0FD;} + .d2-2208838362 .stroke-B6{stroke:#F7F8FE;} + .d2-2208838362 .stroke-AA2{stroke:#4A6FF3;} + .d2-2208838362 .stroke-AA4{stroke:#EDF0FD;} + .d2-2208838362 .stroke-AA5{stroke:#F7F8FE;} + .d2-2208838362 .stroke-AB4{stroke:#EDF0FD;} + .d2-2208838362 .stroke-AB5{stroke:#F7F8FE;} + .d2-2208838362 .background-color-N1{background-color:#0A0F25;} + .d2-2208838362 .background-color-N2{background-color:#676C7E;} + .d2-2208838362 .background-color-N3{background-color:#9499AB;} + .d2-2208838362 .background-color-N4{background-color:#CFD2DD;} + .d2-2208838362 .background-color-N5{background-color:#DEE1EB;} + .d2-2208838362 .background-color-N6{background-color:#EEF1F8;} + .d2-2208838362 .background-color-N7{background-color:#FFFFFF;} + .d2-2208838362 .background-color-B1{background-color:#0D32B2;} + .d2-2208838362 .background-color-B2{background-color:#0D32B2;} + .d2-2208838362 .background-color-B3{background-color:#E3E9FD;} + .d2-2208838362 .background-color-B4{background-color:#E3E9FD;} + .d2-2208838362 .background-color-B5{background-color:#EDF0FD;} + .d2-2208838362 .background-color-B6{background-color:#F7F8FE;} + .d2-2208838362 .background-color-AA2{background-color:#4A6FF3;} + .d2-2208838362 .background-color-AA4{background-color:#EDF0FD;} + .d2-2208838362 .background-color-AA5{background-color:#F7F8FE;} + .d2-2208838362 .background-color-AB4{background-color:#EDF0FD;} + .d2-2208838362 .background-color-AB5{background-color:#F7F8FE;} + .d2-2208838362 .color-N1{color:#0A0F25;} + .d2-2208838362 .color-N2{color:#676C7E;} + .d2-2208838362 .color-N3{color:#9499AB;} + .d2-2208838362 .color-N4{color:#CFD2DD;} + .d2-2208838362 .color-N5{color:#DEE1EB;} + .d2-2208838362 .color-N6{color:#EEF1F8;} + .d2-2208838362 .color-N7{color:#FFFFFF;} + .d2-2208838362 .color-B1{color:#0D32B2;} + .d2-2208838362 .color-B2{color:#0D32B2;} + .d2-2208838362 .color-B3{color:#E3E9FD;} + .d2-2208838362 .color-B4{color:#E3E9FD;} + .d2-2208838362 .color-B5{color:#EDF0FD;} + .d2-2208838362 .color-B6{color:#F7F8FE;} + .d2-2208838362 .color-AA2{color:#4A6FF3;} + .d2-2208838362 .color-AA4{color:#EDF0FD;} + .d2-2208838362 .color-AA5{color:#F7F8FE;} + .d2-2208838362 .color-AB4{color:#EDF0FD;} + .d2-2208838362 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json index 735ab1761c..2818eb9984 100644 --- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "size XS", "type": "rectangle", "pos": { - "x": 804, - "y": 299 + "x": 346, + "y": 359 }, "width": 85, "height": 62, @@ -48,7 +48,7 @@ "id": "size S", "type": "rectangle", "pos": { - "x": 15, + "x": 12, "y": 35 }, "width": 80, @@ -89,8 +89,8 @@ "id": "size M", "type": "rectangle", "pos": { - "x": 12, - "y": 299 + "x": 451, + "y": 359 }, "width": 87, "height": 66, @@ -130,7 +130,7 @@ "id": "size L", "type": "rectangle", "pos": { - "x": 115, + "x": 112, "y": 19 }, "width": 93, @@ -171,7 +171,7 @@ "id": "size XL", "type": "rectangle", "pos": { - "x": 228, + "x": 225, "y": 17 }, "width": 117, @@ -212,7 +212,7 @@ "id": "size XXL", "type": "rectangle", "pos": { - "x": 365, + "x": 362, "y": 14 }, "width": 144, @@ -253,7 +253,7 @@ "id": "size XXXL", "type": "rectangle", "pos": { - "x": 529, + "x": 526, "y": 12 }, "width": 177, @@ -294,7 +294,7 @@ "id": "custom 8", "type": "rectangle", "pos": { - "x": 808, + "x": 723, "y": 42 }, "width": 77, @@ -335,7 +335,7 @@ "id": "custom 12", "type": "rectangle", "pos": { - "x": 905, + "x": 820, "y": 24 }, "width": 100, @@ -376,7 +376,7 @@ "id": "custom 18", "type": "rectangle", "pos": { - "x": 1025, + "x": 940, "y": 21 }, "width": 126, @@ -417,7 +417,7 @@ "id": "custom 21", "type": "rectangle", "pos": { - "x": 1171, + "x": 1086, "y": 19 }, "width": 140, @@ -458,8 +458,8 @@ "id": "custom 64", "type": "rectangle", "pos": { - "x": 451, - "y": 299 + "x": 724, + "y": 359 }, "width": 333, "height": 126, @@ -522,12 +522,20 @@ "labelPercentage": 0, "route": [ { - "x": 847, + "x": 761.5, "y": 98 }, { - "x": 847, - "y": 299 + "x": 761.5, + "y": 138 + }, + { + "x": 389, + "y": 138 + }, + { + "x": 389, + "y": 359 } ], "animated": false, @@ -560,12 +568,20 @@ "labelPercentage": 0, "route": [ { - "x": 55.5, + "x": 52, "y": 98 }, { - "x": 55.5, - "y": 299 + "x": 52, + "y": 188 + }, + { + "x": 495, + "y": 188 + }, + { + "x": 495, + "y": 359 } ], "animated": false, @@ -599,12 +615,20 @@ "labelPercentage": 0, "route": [ { - "x": 618, + "x": 614.5, "y": 98 }, { - "x": 618, - "y": 299 + "x": 614.5, + "y": 188 + }, + { + "x": 891.25, + "y": 188 + }, + { + "x": 891.25, + "y": 359 } ], "animated": false, diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index 276f85d8dc..7fae4ecb36 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - - - - - + .d2-3919801519 .fill-N1{fill:#0A0F25;} + .d2-3919801519 .fill-N2{fill:#676C7E;} + .d2-3919801519 .fill-N3{fill:#9499AB;} + .d2-3919801519 .fill-N4{fill:#CFD2DD;} + .d2-3919801519 .fill-N5{fill:#DEE1EB;} + .d2-3919801519 .fill-N6{fill:#EEF1F8;} + .d2-3919801519 .fill-N7{fill:#FFFFFF;} + .d2-3919801519 .fill-B1{fill:#0D32B2;} + .d2-3919801519 .fill-B2{fill:#0D32B2;} + .d2-3919801519 .fill-B3{fill:#E3E9FD;} + .d2-3919801519 .fill-B4{fill:#E3E9FD;} + .d2-3919801519 .fill-B5{fill:#EDF0FD;} + .d2-3919801519 .fill-B6{fill:#F7F8FE;} + .d2-3919801519 .fill-AA2{fill:#4A6FF3;} + .d2-3919801519 .fill-AA4{fill:#EDF0FD;} + .d2-3919801519 .fill-AA5{fill:#F7F8FE;} + .d2-3919801519 .fill-AB4{fill:#EDF0FD;} + .d2-3919801519 .fill-AB5{fill:#F7F8FE;} + .d2-3919801519 .stroke-N1{stroke:#0A0F25;} + .d2-3919801519 .stroke-N2{stroke:#676C7E;} + .d2-3919801519 .stroke-N3{stroke:#9499AB;} + .d2-3919801519 .stroke-N4{stroke:#CFD2DD;} + .d2-3919801519 .stroke-N5{stroke:#DEE1EB;} + .d2-3919801519 .stroke-N6{stroke:#EEF1F8;} + .d2-3919801519 .stroke-N7{stroke:#FFFFFF;} + .d2-3919801519 .stroke-B1{stroke:#0D32B2;} + .d2-3919801519 .stroke-B2{stroke:#0D32B2;} + .d2-3919801519 .stroke-B3{stroke:#E3E9FD;} + .d2-3919801519 .stroke-B4{stroke:#E3E9FD;} + .d2-3919801519 .stroke-B5{stroke:#EDF0FD;} + .d2-3919801519 .stroke-B6{stroke:#F7F8FE;} + .d2-3919801519 .stroke-AA2{stroke:#4A6FF3;} + .d2-3919801519 .stroke-AA4{stroke:#EDF0FD;} + .d2-3919801519 .stroke-AA5{stroke:#F7F8FE;} + .d2-3919801519 .stroke-AB4{stroke:#EDF0FD;} + .d2-3919801519 .stroke-AB5{stroke:#F7F8FE;} + .d2-3919801519 .background-color-N1{background-color:#0A0F25;} + .d2-3919801519 .background-color-N2{background-color:#676C7E;} + .d2-3919801519 .background-color-N3{background-color:#9499AB;} + .d2-3919801519 .background-color-N4{background-color:#CFD2DD;} + .d2-3919801519 .background-color-N5{background-color:#DEE1EB;} + .d2-3919801519 .background-color-N6{background-color:#EEF1F8;} + .d2-3919801519 .background-color-N7{background-color:#FFFFFF;} + .d2-3919801519 .background-color-B1{background-color:#0D32B2;} + .d2-3919801519 .background-color-B2{background-color:#0D32B2;} + .d2-3919801519 .background-color-B3{background-color:#E3E9FD;} + .d2-3919801519 .background-color-B4{background-color:#E3E9FD;} + .d2-3919801519 .background-color-B5{background-color:#EDF0FD;} + .d2-3919801519 .background-color-B6{background-color:#F7F8FE;} + .d2-3919801519 .background-color-AA2{background-color:#4A6FF3;} + .d2-3919801519 .background-color-AA4{background-color:#EDF0FD;} + .d2-3919801519 .background-color-AA5{background-color:#F7F8FE;} + .d2-3919801519 .background-color-AB4{background-color:#EDF0FD;} + .d2-3919801519 .background-color-AB5{background-color:#F7F8FE;} + .d2-3919801519 .color-N1{color:#0A0F25;} + .d2-3919801519 .color-N2{color:#676C7E;} + .d2-3919801519 .color-N3{color:#9499AB;} + .d2-3919801519 .color-N4{color:#CFD2DD;} + .d2-3919801519 .color-N5{color:#DEE1EB;} + .d2-3919801519 .color-N6{color:#EEF1F8;} + .d2-3919801519 .color-N7{color:#FFFFFF;} + .d2-3919801519 .color-B1{color:#0D32B2;} + .d2-3919801519 .color-B2{color:#0D32B2;} + .d2-3919801519 .color-B3{color:#E3E9FD;} + .d2-3919801519 .color-B4{color:#E3E9FD;} + .d2-3919801519 .color-B5{color:#EDF0FD;} + .d2-3919801519 .color-B6{color:#F7F8FE;} + .d2-3919801519 .color-AA2{color:#4A6FF3;} + .d2-3919801519 .color-AA4{color:#EDF0FD;} + .d2-3919801519 .color-AA5{color:#F7F8FE;} + .d2-3919801519 .color-AB4{color:#EDF0FD;} + .d2-3919801519 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 8b1a9be808..1c17d4e932 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "aa", "type": "step", "pos": { - "x": 241, + "x": 180, "y": 12 }, "width": 102, @@ -48,7 +48,7 @@ "id": "bb", "type": "step", "pos": { - "x": 287, + "x": 133, "y": 193 }, "width": 103, @@ -89,8 +89,8 @@ "id": "cc", "type": "step", "pos": { - "x": 305, - "y": 424 + "x": 215, + "y": 374 }, "width": 101, "height": 101, @@ -130,11 +130,11 @@ "id": "dd", "type": "rectangle", "pos": { - "x": 188, - "y": 701 + "x": 178, + "y": 651 }, "width": 250, - "height": 192, + "height": 322, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "dd.ee", "type": "diamond", "pos": { - "x": 238, - "y": 751 + "x": 228, + "y": 831 }, "width": 64, "height": 92, @@ -212,11 +212,11 @@ "id": "ff", "type": "rectangle", "pos": { - "x": 35, - "y": 1869 + "x": 12, + "y": 1899 }, "width": 284, - "height": 388, + "height": 408, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -253,8 +253,8 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 85, - "y": 1919 + "x": 62, + "y": 2029 }, "width": 80, "height": 92, @@ -294,8 +294,8 @@ "id": "dd.hh", "type": "diamond", "pos": { - "x": 322, - "y": 751 + "x": 312, + "y": 831 }, "width": 66, "height": 92, @@ -335,8 +335,8 @@ "id": "ii", "type": "rectangle", "pos": { - "x": 213, - "y": 978 + "x": 190, + "y": 1058 }, "width": 54, "height": 66, @@ -376,8 +376,8 @@ "id": "jj", "type": "rectangle", "pos": { - "x": 213, - "y": 1169 + "x": 189, + "y": 1249 }, "width": 55, "height": 66, @@ -417,8 +417,8 @@ "id": "kk", "type": "rectangle", "pos": { - "x": 200, - "y": 1431 + "x": 177, + "y": 1511 }, "width": 80, "height": 66, @@ -458,11 +458,11 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 12, - "y": 2448 + "x": 14, + "y": 2498 }, "width": 268, - "height": 320, + "height": 450, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -499,8 +499,8 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 62, - "y": 2498 + "x": 64, + "y": 2678 }, "width": 84, "height": 84, @@ -540,8 +540,8 @@ "id": "ff.mm", "type": "oval", "pos": { - "x": 185, - "y": 1923 + "x": 162, + "y": 2033 }, "width": 84, "height": 84, @@ -581,8 +581,8 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 87, - "y": 3352 + "x": 71, + "y": 3532 }, "width": 327, "height": 210, @@ -622,8 +622,8 @@ "id": "nn.oo", "type": "rectangle", "pos": { - "x": 137, - "y": 3446 + "x": 121, + "y": 3626 }, "width": 63, "height": 66, @@ -663,8 +663,8 @@ "id": "ff.pp", "type": "rectangle", "pos": { - "x": 166, - "y": 2141 + "x": 70, + "y": 2191 }, "width": 63, "height": 66, @@ -704,8 +704,8 @@ "id": "ll.qq", "type": "rectangle", "pos": { - "x": 166, - "y": 2507 + "x": 168, + "y": 2687 }, "width": 64, "height": 66, @@ -745,8 +745,8 @@ "id": "ll.rr", "type": "rectangle", "pos": { - "x": 169, - "y": 2652 + "x": 171, + "y": 2832 }, "width": 58, "height": 66, @@ -786,8 +786,8 @@ "id": "ss", "type": "rectangle", "pos": { - "x": 303, - "y": 1119 + "x": 294, + "y": 1199 }, "width": 158, "height": 166, @@ -827,8 +827,8 @@ "id": "ss.tt", "type": "rectangle", "pos": { - "x": 353, - "y": 1169 + "x": 344, + "y": 1249 }, "width": 58, "height": 66, @@ -868,8 +868,8 @@ "id": "uu", "type": "rectangle", "pos": { - "x": 300, - "y": 1365 + "x": 291, + "y": 1445 }, "width": 163, "height": 166, @@ -909,8 +909,8 @@ "id": "uu.vv", "type": "rectangle", "pos": { - "x": 350, - "y": 1415 + "x": 341, + "y": 1495 }, "width": 63, "height": 66, @@ -950,8 +950,8 @@ "id": "ww", "type": "queue", "pos": { - "x": 283, - "y": 1616 + "x": 274, + "y": 1696 }, "width": 149, "height": 118, @@ -1003,8 +1003,8 @@ "id": "rm", "type": "rectangle", "pos": { - "x": 342, - "y": 2617 + "x": 333, + "y": 2754 }, "width": 80, "height": 66, @@ -1044,8 +1044,8 @@ "id": "nn.xx", "type": "rectangle", "pos": { - "x": 220, - "y": 3446 + "x": 204, + "y": 3626 }, "width": 62, "height": 66, @@ -1085,8 +1085,8 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 321, - "y": 2908 + "x": 322, + "y": 3088 }, "width": 238, "height": 354, @@ -1126,8 +1126,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 371, - "y": 2958 + "x": 372, + "y": 3138 }, "width": 138, "height": 118, @@ -1179,8 +1179,8 @@ "id": "yy.ab", "type": "rectangle", "pos": { - "x": 408, - "y": 3146 + "x": 410, + "y": 3326 }, "width": 63, "height": 66, @@ -1220,8 +1220,8 @@ "id": "nn.ac", "type": "rectangle", "pos": { - "x": 302, - "y": 3446 + "x": 286, + "y": 3626 }, "width": 62, "height": 66, @@ -1261,8 +1261,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 276, - "y": 3637 + "x": 259, + "y": 3817 }, "width": 115, "height": 66, @@ -1325,12 +1325,12 @@ "labelPercentage": 0, "route": [ { - "x": 309, - "y": 111 + "x": 214, + "y": 113 }, { - "x": 309, - "y": 193 + "x": 214, + "y": 210 } ], "animated": false, @@ -1363,12 +1363,20 @@ "labelPercentage": 0, "route": [ { - "x": 356, + "x": 202, "y": 293 }, { - "x": 356, - "y": 424 + "x": 202.41600036621094, + "y": 334 + }, + { + "x": 265.5, + "y": 334 + }, + { + "x": 266, + "y": 374 } ], "animated": false, @@ -1401,28 +1409,28 @@ "labelPercentage": 0, "route": [ { - "x": 275, - "y": 113 + "x": 248, + "y": 112 }, { - "x": 275.25, + "x": 248, "y": 153 }, { - "x": 245.99899291992188, + "x": 339.6659851074219, "y": 153 }, { - "x": 245.99899291992188, - "y": 384 + "x": 339.6659851074219, + "y": 741 }, { - "x": 258.5, - "y": 384 + "x": 260.1659851074219, + "y": 741 }, { - "x": 259, - "y": 768 + "x": 260, + "y": 831 } ], "animated": false, @@ -1455,20 +1463,20 @@ "labelPercentage": 0, "route": [ { - "x": 321, + "x": 168, "y": 294 }, { - "x": 321.3330078125, + "x": 168.08299255371094, "y": 334 }, { - "x": 116.75, + "x": 88.66600036621094, "y": 334 }, { - "x": 117, - "y": 1929 + "x": 89, + "y": 2043 } ], "animated": false, @@ -1501,12 +1509,20 @@ "labelPercentage": 0, "route": [ { - "x": 356, - "y": 525 + "x": 298, + "y": 451 + }, + { + "x": 297.6659851074219, + "y": 791 + }, + { + "x": 345.1659851074219, + "y": 791 }, { - "x": 356, - "y": 751 + "x": 345, + "y": 831 } ], "animated": false, @@ -1539,20 +1555,20 @@ "labelPercentage": 0, "route": [ { - "x": 271, - "y": 843 + "x": 260, + "y": 923 }, { - "x": 270.8330078125, - "y": 938 + "x": 260.1659851074219, + "y": 1018 }, { - "x": 240.83299255371094, - "y": 938 + "x": 217.33299255371094, + "y": 1018 }, { - "x": 240.83299255371094, - "y": 978 + "x": 217.33299255371094, + "y": 1058 } ], "animated": false, @@ -1585,12 +1601,12 @@ "labelPercentage": 0, "route": [ { - "x": 240.83299255371094, - "y": 1044 + "x": 217.33299255371094, + "y": 1124 }, { - "x": 240.83299255371094, - "y": 1169 + "x": 217.33299255371094, + "y": 1249 } ], "animated": false, @@ -1623,12 +1639,12 @@ "labelPercentage": 0, "route": [ { - "x": 240.83299255371094, - "y": 1234.666015625 + "x": 217.33299255371094, + "y": 1314.666015625 }, { - "x": 240.83299255371094, - "y": 1431.666015625 + "x": 217.33299255371094, + "y": 1511.666015625 } ], "animated": false, @@ -1661,12 +1677,12 @@ "labelPercentage": 0, "route": [ { - "x": 227.49899291992188, - "y": 1498 + "x": 204, + "y": 1578 }, { - "x": 228, - "y": 1923 + "x": 204, + "y": 2033 } ], "animated": false, @@ -1699,20 +1715,20 @@ "labelPercentage": 0, "route": [ { - "x": 228, - "y": 2007 + "x": 182, + "y": 2111 }, { - "x": 227.49899291992188, - "y": 2101 + "x": 182, + "y": 2588 }, { - "x": 114.7490005493164, - "y": 2101 + "x": 106, + "y": 2588 }, { - "x": 115, - "y": 2499 + "x": 106, + "y": 2678 } ], "animated": false, @@ -1745,20 +1761,20 @@ "labelPercentage": 0, "route": [ { - "x": 104, - "y": 2582 + "x": 106, + "y": 2762 }, { - "x": 104, - "y": 3307 + "x": 106, + "y": 3487 }, { - "x": 169.16600036621094, - "y": 3307 + "x": 152.83299255371094, + "y": 3487 }, { - "x": 169.16600036621094, - "y": 3446 + "x": 152.83299255371094, + "y": 3626 } ], "animated": false, @@ -1791,20 +1807,12 @@ "labelPercentage": 0, "route": [ { - "x": 126, - "y": 2011 + "x": 102, + "y": 2121 }, { - "x": 125.4990005493164, - "y": 2051 - }, - { - "x": 197.99899291992188, - "y": 2051 - }, - { - "x": 197.99899291992188, - "y": 2141 + "x": 102, + "y": 2191 } ], "animated": false, @@ -1837,12 +1845,28 @@ "labelPercentage": 0, "route": [ { - "x": 198, - "y": 2207 + "x": 102, + "y": 2257 }, { - "x": 198, - "y": 2507 + "x": 102, + "y": 2453 + }, + { + "x": 148, + "y": 2453 + }, + { + "x": 148, + "y": 2638 + }, + { + "x": 200, + "y": 2638 + }, + { + "x": 200, + "y": 2687 } ], "animated": false, @@ -1875,12 +1899,12 @@ "labelPercentage": 0, "route": [ { - "x": 198, - "y": 2573 + "x": 200, + "y": 2753 }, { - "x": 198, - "y": 2652 + "x": 200, + "y": 2832 } ], "animated": false, @@ -1913,20 +1937,20 @@ "labelPercentage": 0, "route": [ { - "x": 356, - "y": 843 + "x": 345, + "y": 923 }, { - "x": 355.8330078125, - "y": 938 + "x": 345.1659851074219, + "y": 1018 }, { - "x": 382.3330078125, - "y": 938 + "x": 373.4159851074219, + "y": 1018 }, { - "x": 382.3330078125, - "y": 1169 + "x": 373.4159851074219, + "y": 1249 } ], "animated": false, @@ -1959,12 +1983,12 @@ "labelPercentage": 0, "route": [ { - "x": 382.3330078125, - "y": 1235 + "x": 373.4159851074219, + "y": 1315 }, { - "x": 382.3330078125, - "y": 1415 + "x": 373.4159851074219, + "y": 1495 } ], "animated": false, @@ -1997,20 +2021,20 @@ "labelPercentage": 0, "route": [ { - "x": 254.16600036621094, - "y": 1498 + "x": 230.66600036621094, + "y": 1578 }, { - "x": 254.16600036621094, - "y": 1576 + "x": 230.66600036621094, + "y": 1656 }, { - "x": 332.6659851074219, - "y": 1576 + "x": 323.75, + "y": 1656 }, { - "x": 333, - "y": 1616 + "x": 324, + "y": 1696 } ], "animated": false, @@ -2043,12 +2067,12 @@ "labelPercentage": 0, "route": [ { - "x": 382.3330078125, - "y": 1481 + "x": 373.4159851074219, + "y": 1561 }, { - "x": 382, - "y": 1616 + "x": 373, + "y": 1696 } ], "animated": false, @@ -2081,12 +2105,12 @@ "labelPercentage": 0, "route": [ { - "x": 382, - "y": 1734 + "x": 373, + "y": 1814 }, { - "x": 382, - "y": 2617 + "x": 373, + "y": 2754 } ], "animated": false, @@ -2119,20 +2143,20 @@ "labelPercentage": 0, "route": [ { - "x": 368.9989929199219, - "y": 2683 + "x": 360.0830078125, + "y": 2820 }, { - "x": 368.9989929199219, - "y": 2813 + "x": 360.0830078125, + "y": 2993 }, { - "x": 251.66600036621094, - "y": 2813 + "x": 235.33299255371094, + "y": 2993 }, { - "x": 251.66600036621094, - "y": 3446 + "x": 235.33299255371094, + "y": 3626 } ], "animated": false, @@ -2165,20 +2189,20 @@ "labelPercentage": 0, "route": [ { - "x": 198, - "y": 2718 + "x": 200, + "y": 2898 }, { - "x": 198, - "y": 2863 + "x": 200, + "y": 3043 }, { - "x": 417.0830078125, - "y": 2863 + "x": 418.9159851074219, + "y": 3043 }, { - "x": 417, - "y": 2958 + "x": 419, + "y": 3138 } ], "animated": false, @@ -2211,20 +2235,20 @@ "labelPercentage": 0, "route": [ { - "x": 395.6659851074219, - "y": 2683 + "x": 386.75, + "y": 2820 }, { - "x": 395.6659851074219, - "y": 2813 + "x": 386.75, + "y": 2993 }, { - "x": 463.0830078125, - "y": 2813 + "x": 464.9159851074219, + "y": 2993 }, { - "x": 463, - "y": 2958 + "x": 465, + "y": 3138 } ], "animated": false, @@ -2257,12 +2281,12 @@ "labelPercentage": 0, "route": [ { - "x": 440, - "y": 3076 + "x": 442, + "y": 3256 }, { - "x": 440, - "y": 3146 + "x": 442, + "y": 3326 } ], "animated": false, @@ -2295,20 +2319,20 @@ "labelPercentage": 0, "route": [ { - "x": 440.0830078125, - "y": 3212 + "x": 441.9159851074219, + "y": 3392 }, { - "x": 440.0830078125, - "y": 3307 + "x": 441.9159851074219, + "y": 3487 }, { - "x": 333.6659851074219, - "y": 3307 + "x": 317.3330078125, + "y": 3487 }, { - "x": 333.6659851074219, - "y": 3446 + "x": 317.3330078125, + "y": 3626 } ], "animated": false, @@ -2341,12 +2365,12 @@ "labelPercentage": 0, "route": [ { - "x": 333.6659851074219, - "y": 3512 + "x": 317.3330078125, + "y": 3692 }, { - "x": 334, - "y": 3637 + "x": 317, + "y": 3817 } ], "animated": false, @@ -2379,20 +2403,20 @@ "labelPercentage": 0, "route": [ { - "x": 333, - "y": 1734 + "x": 324, + "y": 1814 }, { - "x": 332.6659851074219, - "y": 1824 + "x": 323.75, + "y": 1989 }, { - "x": 138.83299255371094, - "y": 1824 + "x": 115.33300018310547, + "y": 1989 }, { - "x": 139, - "y": 1934 + "x": 115, + "y": 2044 } ], "animated": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 34a3f572af..d128b72745 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3141396570 .fill-N1{fill:#0A0F25;} + .d2-3141396570 .fill-N2{fill:#676C7E;} + .d2-3141396570 .fill-N3{fill:#9499AB;} + .d2-3141396570 .fill-N4{fill:#CFD2DD;} + .d2-3141396570 .fill-N5{fill:#DEE1EB;} + .d2-3141396570 .fill-N6{fill:#EEF1F8;} + .d2-3141396570 .fill-N7{fill:#FFFFFF;} + .d2-3141396570 .fill-B1{fill:#0D32B2;} + .d2-3141396570 .fill-B2{fill:#0D32B2;} + .d2-3141396570 .fill-B3{fill:#E3E9FD;} + .d2-3141396570 .fill-B4{fill:#E3E9FD;} + .d2-3141396570 .fill-B5{fill:#EDF0FD;} + .d2-3141396570 .fill-B6{fill:#F7F8FE;} + .d2-3141396570 .fill-AA2{fill:#4A6FF3;} + .d2-3141396570 .fill-AA4{fill:#EDF0FD;} + .d2-3141396570 .fill-AA5{fill:#F7F8FE;} + .d2-3141396570 .fill-AB4{fill:#EDF0FD;} + .d2-3141396570 .fill-AB5{fill:#F7F8FE;} + .d2-3141396570 .stroke-N1{stroke:#0A0F25;} + .d2-3141396570 .stroke-N2{stroke:#676C7E;} + .d2-3141396570 .stroke-N3{stroke:#9499AB;} + .d2-3141396570 .stroke-N4{stroke:#CFD2DD;} + .d2-3141396570 .stroke-N5{stroke:#DEE1EB;} + .d2-3141396570 .stroke-N6{stroke:#EEF1F8;} + .d2-3141396570 .stroke-N7{stroke:#FFFFFF;} + .d2-3141396570 .stroke-B1{stroke:#0D32B2;} + .d2-3141396570 .stroke-B2{stroke:#0D32B2;} + .d2-3141396570 .stroke-B3{stroke:#E3E9FD;} + .d2-3141396570 .stroke-B4{stroke:#E3E9FD;} + .d2-3141396570 .stroke-B5{stroke:#EDF0FD;} + .d2-3141396570 .stroke-B6{stroke:#F7F8FE;} + .d2-3141396570 .stroke-AA2{stroke:#4A6FF3;} + .d2-3141396570 .stroke-AA4{stroke:#EDF0FD;} + .d2-3141396570 .stroke-AA5{stroke:#F7F8FE;} + .d2-3141396570 .stroke-AB4{stroke:#EDF0FD;} + .d2-3141396570 .stroke-AB5{stroke:#F7F8FE;} + .d2-3141396570 .background-color-N1{background-color:#0A0F25;} + .d2-3141396570 .background-color-N2{background-color:#676C7E;} + .d2-3141396570 .background-color-N3{background-color:#9499AB;} + .d2-3141396570 .background-color-N4{background-color:#CFD2DD;} + .d2-3141396570 .background-color-N5{background-color:#DEE1EB;} + .d2-3141396570 .background-color-N6{background-color:#EEF1F8;} + .d2-3141396570 .background-color-N7{background-color:#FFFFFF;} + .d2-3141396570 .background-color-B1{background-color:#0D32B2;} + .d2-3141396570 .background-color-B2{background-color:#0D32B2;} + .d2-3141396570 .background-color-B3{background-color:#E3E9FD;} + .d2-3141396570 .background-color-B4{background-color:#E3E9FD;} + .d2-3141396570 .background-color-B5{background-color:#EDF0FD;} + .d2-3141396570 .background-color-B6{background-color:#F7F8FE;} + .d2-3141396570 .background-color-AA2{background-color:#4A6FF3;} + .d2-3141396570 .background-color-AA4{background-color:#EDF0FD;} + .d2-3141396570 .background-color-AA5{background-color:#F7F8FE;} + .d2-3141396570 .background-color-AB4{background-color:#EDF0FD;} + .d2-3141396570 .background-color-AB5{background-color:#F7F8FE;} + .d2-3141396570 .color-N1{color:#0A0F25;} + .d2-3141396570 .color-N2{color:#676C7E;} + .d2-3141396570 .color-N3{color:#9499AB;} + .d2-3141396570 .color-N4{color:#CFD2DD;} + .d2-3141396570 .color-N5{color:#DEE1EB;} + .d2-3141396570 .color-N6{color:#EEF1F8;} + .d2-3141396570 .color-N7{color:#FFFFFF;} + .d2-3141396570 .color-B1{color:#0D32B2;} + .d2-3141396570 .color-B2{color:#0D32B2;} + .d2-3141396570 .color-B3{color:#E3E9FD;} + .d2-3141396570 .color-B4{color:#E3E9FD;} + .d2-3141396570 .color-B5{color:#EDF0FD;} + .d2-3141396570 .color-B6{color:#F7F8FE;} + .d2-3141396570 .color-AA2{color:#4A6FF3;} + .d2-3141396570 .color-AA4{color:#EDF0FD;} + .d2-3141396570 .color-AA5{color:#F7F8FE;} + .d2-3141396570 .color-AB4{color:#EDF0FD;} + .d2-3141396570 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index 331db4ae7a..b83f5d105b 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 85, + "x": 12, "y": 436 }, "width": 53, @@ -48,7 +48,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 12, + "x": 85, "y": 436 }, "width": 53, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 619, - "y": 1768 + "x": 161, + "y": 1868 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 545, - "y": 1768 + "x": 234, + "y": 1868 }, "width": 54, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 546, - "y": 1904 + "x": 234, + "y": 2004 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 474, - "y": 1768 + "x": 308, + "y": 1868 }, "width": 51, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 243, - "y": 1768 + "x": 379, + "y": 1868 }, "width": 80, "height": 66, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 452, + "x": 394, "y": 1061 }, "width": 546, @@ -376,7 +376,7 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 724, + "x": 666, "y": 1111 }, "width": 222, @@ -417,7 +417,7 @@ "id": "i.j.k", "type": "rectangle", "pos": { - "x": 774, + "x": 716, "y": 1161 }, "width": 53, @@ -458,7 +458,7 @@ "id": "i.j.l", "type": "rectangle", "pos": { - "x": 847, + "x": 789, "y": 1161 }, "width": 49, @@ -499,7 +499,7 @@ "id": "i.m", "type": "rectangle", "pos": { - "x": 502, + "x": 444, "y": 1427 }, "width": 200, @@ -540,7 +540,7 @@ "id": "i.n", "type": "rectangle", "pos": { - "x": 722, + "x": 664, "y": 1467 }, "width": 53, @@ -581,7 +581,7 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 795, + "x": 737, "y": 1367 }, "width": 153, @@ -622,7 +622,7 @@ "id": "i.o.p", "type": "rectangle", "pos": { - "x": 845, + "x": 787, "y": 1417 }, "width": 53, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 968, - "y": 1768 + "x": 910, + "y": 1868 }, "width": 80, "height": 66, @@ -1383,19 +1383,19 @@ "labelPercentage": 0, "route": [ { - "x": 801.25, + "x": 743, "y": 1227 }, { - "x": 801.25, + "x": 743, "y": 1322 }, { - "x": 652.75, + "x": 594.5, "y": 1322 }, { - "x": 652.75, + "x": 594.5, "y": 1428 } ], @@ -1429,11 +1429,11 @@ "labelPercentage": 0, "route": [ { - "x": 872.25, + "x": 814, "y": 1227 }, { - "x": 872.25, + "x": 814, "y": 1417 } ], @@ -1467,27 +1467,27 @@ "labelPercentage": 0, "route": [ { - "x": 1028.75, - "y": 1768 + "x": 970.5, + "y": 1868 }, { - "x": 1028.75, + "x": 970.5, "y": 1628 }, { - "x": 1038.75, + "x": 980.5, "y": 1628 }, { - "x": 1038.75, + "x": 980.5, "y": 1016 }, { - "x": 602.75, + "x": 544.5, "y": 1016 }, { - "x": 602.75, + "x": 544.5, "y": 1428 } ], @@ -1521,20 +1521,20 @@ "labelPercentage": 0, "route": [ { - "x": 669.416015625, + "x": 611.166015625, "y": 1494 }, { - "x": 669.416015625, + "x": 611.166015625, "y": 1678 }, { - "x": 988.75, + "x": 930.5, "y": 1678 }, { - "x": 988.75, - "y": 1768 + "x": 930.5, + "y": 1868 } ], "animated": false, @@ -1567,20 +1567,20 @@ "labelPercentage": 0, "route": [ { - "x": 749.25, + "x": 691, "y": 1533 }, { - "x": 749.25, + "x": 691, "y": 1628 }, { - "x": 1008.75, + "x": 950.5, "y": 1628 }, { - "x": 1008.75, - "y": 1768 + "x": 950.5, + "y": 1868 } ], "animated": false, @@ -1613,12 +1613,20 @@ "labelPercentage": 0, "route": [ { - "x": 646.166015625, + "x": 477.8330078125, "y": 1494 }, { - "x": 646.166015625, - "y": 1768 + "x": 477.8330078125, + "y": 1678 + }, + { + "x": 187.66600036621094, + "y": 1678 + }, + { + "x": 187.66600036621094, + "y": 1868 } ], "animated": false, @@ -1651,20 +1659,20 @@ "labelPercentage": 0, "route": [ { - "x": 602.75, + "x": 511.1659851074219, "y": 1494 }, { - "x": 602.75, + "x": 511.1659851074219, "y": 1728 }, { - "x": 572.666015625, + "x": 261.1659851074219, "y": 1728 }, { - "x": 572.666015625, - "y": 1768 + "x": 261.1659851074219, + "y": 1868 } ], "animated": false, @@ -1697,20 +1705,20 @@ "labelPercentage": 0, "route": [ { - "x": 536.0830078125, + "x": 577.8330078125, "y": 1494 }, { - "x": 536.0830078125, - "y": 1628 + "x": 577.8330078125, + "y": 1828 }, { - "x": 297.1659851074219, - "y": 1628 + "x": 432.5, + "y": 1828 }, { - "x": 297.1659851074219, - "y": 1768 + "x": 432.5, + "y": 1868 } ], "animated": false, @@ -1743,20 +1751,20 @@ "labelPercentage": 0, "route": [ { - "x": 569.416015625, + "x": 544.5, "y": 1494 }, { - "x": 569.416015625, - "y": 1678 + "x": 544.5, + "y": 1778 }, { - "x": 500.1659851074219, - "y": 1678 + "x": 333.6659851074219, + "y": 1778 }, { - "x": 500.1659851074219, - "y": 1768 + "x": 333.6659851074219, + "y": 1868 } ], "animated": false, @@ -1789,12 +1797,12 @@ "labelPercentage": 0, "route": [ { - "x": 572.666015625, - "y": 1834 + "x": 261.1659851074219, + "y": 1934 }, { - "x": 572.666015625, - "y": 1904 + "x": 261.1659851074219, + "y": 2004 } ], "animated": false, @@ -2041,11 +2049,11 @@ "y": 966 }, { - "x": 552.75, + "x": 494.5, "y": 966 }, { - "x": 552.75, + "x": 494.5, "y": 1428 } ], @@ -2084,7 +2092,15 @@ }, { "x": 270.5, - "y": 1768 + "y": 1628 + }, + { + "x": 405.8330078125, + "y": 1628 + }, + { + "x": 405.8330078125, + "y": 1868 } ], "animated": false, diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 8306f964f6..28e442b0bd 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - + .d2-102503817 .fill-N1{fill:#0A0F25;} + .d2-102503817 .fill-N2{fill:#676C7E;} + .d2-102503817 .fill-N3{fill:#9499AB;} + .d2-102503817 .fill-N4{fill:#CFD2DD;} + .d2-102503817 .fill-N5{fill:#DEE1EB;} + .d2-102503817 .fill-N6{fill:#EEF1F8;} + .d2-102503817 .fill-N7{fill:#FFFFFF;} + .d2-102503817 .fill-B1{fill:#0D32B2;} + .d2-102503817 .fill-B2{fill:#0D32B2;} + .d2-102503817 .fill-B3{fill:#E3E9FD;} + .d2-102503817 .fill-B4{fill:#E3E9FD;} + .d2-102503817 .fill-B5{fill:#EDF0FD;} + .d2-102503817 .fill-B6{fill:#F7F8FE;} + .d2-102503817 .fill-AA2{fill:#4A6FF3;} + .d2-102503817 .fill-AA4{fill:#EDF0FD;} + .d2-102503817 .fill-AA5{fill:#F7F8FE;} + .d2-102503817 .fill-AB4{fill:#EDF0FD;} + .d2-102503817 .fill-AB5{fill:#F7F8FE;} + .d2-102503817 .stroke-N1{stroke:#0A0F25;} + .d2-102503817 .stroke-N2{stroke:#676C7E;} + .d2-102503817 .stroke-N3{stroke:#9499AB;} + .d2-102503817 .stroke-N4{stroke:#CFD2DD;} + .d2-102503817 .stroke-N5{stroke:#DEE1EB;} + .d2-102503817 .stroke-N6{stroke:#EEF1F8;} + .d2-102503817 .stroke-N7{stroke:#FFFFFF;} + .d2-102503817 .stroke-B1{stroke:#0D32B2;} + .d2-102503817 .stroke-B2{stroke:#0D32B2;} + .d2-102503817 .stroke-B3{stroke:#E3E9FD;} + .d2-102503817 .stroke-B4{stroke:#E3E9FD;} + .d2-102503817 .stroke-B5{stroke:#EDF0FD;} + .d2-102503817 .stroke-B6{stroke:#F7F8FE;} + .d2-102503817 .stroke-AA2{stroke:#4A6FF3;} + .d2-102503817 .stroke-AA4{stroke:#EDF0FD;} + .d2-102503817 .stroke-AA5{stroke:#F7F8FE;} + .d2-102503817 .stroke-AB4{stroke:#EDF0FD;} + .d2-102503817 .stroke-AB5{stroke:#F7F8FE;} + .d2-102503817 .background-color-N1{background-color:#0A0F25;} + .d2-102503817 .background-color-N2{background-color:#676C7E;} + .d2-102503817 .background-color-N3{background-color:#9499AB;} + .d2-102503817 .background-color-N4{background-color:#CFD2DD;} + .d2-102503817 .background-color-N5{background-color:#DEE1EB;} + .d2-102503817 .background-color-N6{background-color:#EEF1F8;} + .d2-102503817 .background-color-N7{background-color:#FFFFFF;} + .d2-102503817 .background-color-B1{background-color:#0D32B2;} + .d2-102503817 .background-color-B2{background-color:#0D32B2;} + .d2-102503817 .background-color-B3{background-color:#E3E9FD;} + .d2-102503817 .background-color-B4{background-color:#E3E9FD;} + .d2-102503817 .background-color-B5{background-color:#EDF0FD;} + .d2-102503817 .background-color-B6{background-color:#F7F8FE;} + .d2-102503817 .background-color-AA2{background-color:#4A6FF3;} + .d2-102503817 .background-color-AA4{background-color:#EDF0FD;} + .d2-102503817 .background-color-AA5{background-color:#F7F8FE;} + .d2-102503817 .background-color-AB4{background-color:#EDF0FD;} + .d2-102503817 .background-color-AB5{background-color:#F7F8FE;} + .d2-102503817 .color-N1{color:#0A0F25;} + .d2-102503817 .color-N2{color:#676C7E;} + .d2-102503817 .color-N3{color:#9499AB;} + .d2-102503817 .color-N4{color:#CFD2DD;} + .d2-102503817 .color-N5{color:#DEE1EB;} + .d2-102503817 .color-N6{color:#EEF1F8;} + .d2-102503817 .color-N7{color:#FFFFFF;} + .d2-102503817 .color-B1{color:#0D32B2;} + .d2-102503817 .color-B2{color:#0D32B2;} + .d2-102503817 .color-B3{color:#E3E9FD;} + .d2-102503817 .color-B4{color:#E3E9FD;} + .d2-102503817 .color-B5{color:#EDF0FD;} + .d2-102503817 .color-B6{color:#F7F8FE;} + .d2-102503817 .color-AA2{color:#4A6FF3;} + .d2-102503817 .color-AA4{color:#EDF0FD;} + .d2-102503817 .color-AA5{color:#F7F8FE;} + .d2-102503817 .color-AB4{color:#EDF0FD;} + .d2-102503817 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + - - - - - + + + + + + - - + + - - - - + + + + @@ -120,9 +120,9 @@ - - - + + + diff --git a/e2etests/testdata/stable/mono-font/elk/board.exp.json b/e2etests/testdata/stable/mono-font/elk/board.exp.json index c469d3de02..993b9448e8 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -112,11 +112,11 @@ "labelPercentage": 0, "route": [ { - "x": 49, + "x": 145, "y": 88 }, { - "x": 49.5, + "x": 145.5, "y": 269 } ], @@ -188,11 +188,11 @@ "labelPercentage": 0, "route": [ { - "x": 145, + "x": 49, "y": 88 }, { - "x": 145.5, + "x": 49.5, "y": 269 } ], diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index ff0dc3ada1..2c18f16546 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-3725597646 .fill-N1{fill:#0A0F25;} + .d2-3725597646 .fill-N2{fill:#676C7E;} + .d2-3725597646 .fill-N3{fill:#9499AB;} + .d2-3725597646 .fill-N4{fill:#CFD2DD;} + .d2-3725597646 .fill-N5{fill:#DEE1EB;} + .d2-3725597646 .fill-N6{fill:#EEF1F8;} + .d2-3725597646 .fill-N7{fill:#FFFFFF;} + .d2-3725597646 .fill-B1{fill:#0D32B2;} + .d2-3725597646 .fill-B2{fill:#0D32B2;} + .d2-3725597646 .fill-B3{fill:#E3E9FD;} + .d2-3725597646 .fill-B4{fill:#E3E9FD;} + .d2-3725597646 .fill-B5{fill:#EDF0FD;} + .d2-3725597646 .fill-B6{fill:#F7F8FE;} + .d2-3725597646 .fill-AA2{fill:#4A6FF3;} + .d2-3725597646 .fill-AA4{fill:#EDF0FD;} + .d2-3725597646 .fill-AA5{fill:#F7F8FE;} + .d2-3725597646 .fill-AB4{fill:#EDF0FD;} + .d2-3725597646 .fill-AB5{fill:#F7F8FE;} + .d2-3725597646 .stroke-N1{stroke:#0A0F25;} + .d2-3725597646 .stroke-N2{stroke:#676C7E;} + .d2-3725597646 .stroke-N3{stroke:#9499AB;} + .d2-3725597646 .stroke-N4{stroke:#CFD2DD;} + .d2-3725597646 .stroke-N5{stroke:#DEE1EB;} + .d2-3725597646 .stroke-N6{stroke:#EEF1F8;} + .d2-3725597646 .stroke-N7{stroke:#FFFFFF;} + .d2-3725597646 .stroke-B1{stroke:#0D32B2;} + .d2-3725597646 .stroke-B2{stroke:#0D32B2;} + .d2-3725597646 .stroke-B3{stroke:#E3E9FD;} + .d2-3725597646 .stroke-B4{stroke:#E3E9FD;} + .d2-3725597646 .stroke-B5{stroke:#EDF0FD;} + .d2-3725597646 .stroke-B6{stroke:#F7F8FE;} + .d2-3725597646 .stroke-AA2{stroke:#4A6FF3;} + .d2-3725597646 .stroke-AA4{stroke:#EDF0FD;} + .d2-3725597646 .stroke-AA5{stroke:#F7F8FE;} + .d2-3725597646 .stroke-AB4{stroke:#EDF0FD;} + .d2-3725597646 .stroke-AB5{stroke:#F7F8FE;} + .d2-3725597646 .background-color-N1{background-color:#0A0F25;} + .d2-3725597646 .background-color-N2{background-color:#676C7E;} + .d2-3725597646 .background-color-N3{background-color:#9499AB;} + .d2-3725597646 .background-color-N4{background-color:#CFD2DD;} + .d2-3725597646 .background-color-N5{background-color:#DEE1EB;} + .d2-3725597646 .background-color-N6{background-color:#EEF1F8;} + .d2-3725597646 .background-color-N7{background-color:#FFFFFF;} + .d2-3725597646 .background-color-B1{background-color:#0D32B2;} + .d2-3725597646 .background-color-B2{background-color:#0D32B2;} + .d2-3725597646 .background-color-B3{background-color:#E3E9FD;} + .d2-3725597646 .background-color-B4{background-color:#E3E9FD;} + .d2-3725597646 .background-color-B5{background-color:#EDF0FD;} + .d2-3725597646 .background-color-B6{background-color:#F7F8FE;} + .d2-3725597646 .background-color-AA2{background-color:#4A6FF3;} + .d2-3725597646 .background-color-AA4{background-color:#EDF0FD;} + .d2-3725597646 .background-color-AA5{background-color:#F7F8FE;} + .d2-3725597646 .background-color-AB4{background-color:#EDF0FD;} + .d2-3725597646 .background-color-AB5{background-color:#F7F8FE;} + .d2-3725597646 .color-N1{color:#0A0F25;} + .d2-3725597646 .color-N2{color:#676C7E;} + .d2-3725597646 .color-N3{color:#9499AB;} + .d2-3725597646 .color-N4{color:#CFD2DD;} + .d2-3725597646 .color-N5{color:#DEE1EB;} + .d2-3725597646 .color-N6{color:#EEF1F8;} + .d2-3725597646 .color-N7{color:#FFFFFF;} + .d2-3725597646 .color-B1{color:#0D32B2;} + .d2-3725597646 .color-B2{color:#0D32B2;} + .d2-3725597646 .color-B3{color:#E3E9FD;} + .d2-3725597646 .color-B4{color:#E3E9FD;} + .d2-3725597646 .color-B5{color:#EDF0FD;} + .d2-3725597646 .color-B6{color:#F7F8FE;} + .d2-3725597646 .color-AA2{color:#4A6FF3;} + .d2-3725597646 .color-AA4{color:#EDF0FD;} + .d2-3725597646 .color-AA5{color:#F7F8FE;} + .d2-3725597646 .color-AB4{color:#EDF0FD;} + .d2-3725597646 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SATELLITESTRANSMITTER SENDSENDSEND - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index 06d7589dc3..419a1d2bfc 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 310, + "x": 101, "y": 294 }, "width": 240, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 29, - "y": 590 + "x": 12, + "y": 790 }, "width": 120, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 169, - "y": 590 + "x": 152, + "y": 790 }, "width": 80, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 317, - "y": 590 + "x": 299, + "y": 790 }, "width": 80, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 463, - "y": 590 + "x": 446, + "y": 790 }, "width": 80, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 607, - "y": 590 + "x": 589, + "y": 790 }, "width": 80, "height": 66, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 390, + "x": 181, "y": 158 }, "width": 80, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 707, - "y": 590 + "x": 689, + "y": 790 }, "width": 120, "height": 66, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 82, + "x": 361, "y": 294 }, "width": 49, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 12, + "x": 430, "y": 294 }, "width": 50, @@ -417,7 +417,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 439, + "x": 181, "y": 12 }, "width": 53, @@ -458,7 +458,7 @@ "id": "l", "type": "rectangle", "pos": { - "x": 370, + "x": 254, "y": 12 }, "width": 49, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 143, - "y": 736 + "x": 125, + "y": 936 }, "width": 57, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 220, - "y": 736 + "x": 203, + "y": 936 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 293, - "y": 736 + "x": 276, + "y": 936 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 367, - "y": 736 + "x": 350, + "y": 936 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 440, - "y": 736 + "x": 423, + "y": 936 }, "width": 54, "height": 66, @@ -704,8 +704,8 @@ "id": "r", "type": "rectangle", "pos": { - "x": 514, - "y": 736 + "x": 497, + "y": 936 }, "width": 51, "height": 66, @@ -745,8 +745,8 @@ "id": "s", "type": "rectangle", "pos": { - "x": 367, - "y": 872 + "x": 350, + "y": 1072 }, "width": 52, "height": 66, @@ -786,8 +786,8 @@ "id": "t", "type": "rectangle", "pos": { - "x": 585, - "y": 736 + "x": 568, + "y": 936 }, "width": 51, "height": 66, @@ -827,8 +827,8 @@ "id": "u", "type": "rectangle", "pos": { - "x": 656, - "y": 736 + "x": 639, + "y": 936 }, "width": 54, "height": 66, @@ -868,7 +868,7 @@ "id": "v", "type": "rectangle", "pos": { - "x": 717, + "x": 700, "y": 294 }, "width": 54, @@ -909,7 +909,7 @@ "id": "w", "type": "rectangle", "pos": { - "x": 791, + "x": 774, "y": 294 }, "width": 58, @@ -973,20 +973,20 @@ "labelPercentage": 0, "route": [ { - "x": 344.2850036621094, + "x": 135.35699462890625, "y": 360 }, { - "x": 344.2850036621094, - "y": 450 + "x": 135.35699462890625, + "y": 400 }, { - "x": 119.25, - "y": 450 + "x": 42, + "y": 400 }, { - "x": 119.25, - "y": 590 + "x": 42, + "y": 790 } ], "animated": false, @@ -1019,20 +1019,20 @@ "labelPercentage": 0, "route": [ { - "x": 378.5710144042969, + "x": 169.64199829101562, "y": 360 }, { - "x": 378.5710144042969, - "y": 500 + "x": 169.64199829101562, + "y": 750 }, { - "x": 209.25, - "y": 500 + "x": 192, + "y": 750 }, { - "x": 209.25, - "y": 590 + "x": 192, + "y": 790 } ], "animated": false, @@ -1065,20 +1065,20 @@ "labelPercentage": 0, "route": [ { - "x": 412.85699462890625, + "x": 203.92799377441406, "y": 360 }, { - "x": 412.85699462890625, - "y": 550 + "x": 203.92799377441406, + "y": 650 }, { - "x": 357, - "y": 550 + "x": 339.75, + "y": 650 }, { - "x": 357, - "y": 590 + "x": 339.75, + "y": 790 } ], "animated": false, @@ -1111,20 +1111,20 @@ "labelPercentage": 0, "route": [ { - "x": 447.1419982910156, + "x": 238.21400451660156, "y": 360 }, { - "x": 447.1419982910156, + "x": 238.21400451660156, "y": 550 }, { - "x": 503.5, + "x": 486.25, "y": 550 }, { - "x": 503.5, - "y": 590 + "x": 486.25, + "y": 790 } ], "animated": false, @@ -1157,20 +1157,20 @@ "labelPercentage": 0, "route": [ { - "x": 481.4280090332031, + "x": 272.5, "y": 360 }, { - "x": 481.4280090332031, + "x": 272.5, "y": 500 }, { - "x": 647, + "x": 629.75, "y": 500 }, { - "x": 647, - "y": 590 + "x": 629.75, + "y": 790 } ], "animated": false, @@ -1203,11 +1203,11 @@ "labelPercentage": 0, "route": [ { - "x": 430, + "x": 221.0709991455078, "y": 224 }, { - "x": 430, + "x": 221.0709991455078, "y": 294 } ], @@ -1241,20 +1241,20 @@ "labelPercentage": 0, "route": [ { - "x": 515.7139892578125, + "x": 306.7850036621094, "y": 360 }, { - "x": 515.7139892578125, + "x": 306.7850036621094, "y": 450 }, { - "x": 737, + "x": 719.75, "y": 450 }, { - "x": 737, - "y": 590 + "x": 719.75, + "y": 790 } ], "animated": false, @@ -1287,20 +1287,20 @@ "labelPercentage": 0, "route": [ { - "x": 106.5, + "x": 385.5710144042969, "y": 360 }, { - "x": 106.5, - "y": 400 + "x": 385.5710144042969, + "y": 600 }, { - "x": 89.25, - "y": 400 + "x": 72, + "y": 600 }, { - "x": 89.25, - "y": 590 + "x": 72, + "y": 790 } ], "animated": false, @@ -1333,20 +1333,20 @@ "labelPercentage": 0, "route": [ { - "x": 37, + "x": 455.0710144042969, "y": 360 }, { - "x": 37, - "y": 400 + "x": 455.0710144042969, + "y": 700 }, { - "x": 59.25, - "y": 400 + "x": 102, + "y": 700 }, { - "x": 59.25, - "y": 590 + "x": 102, + "y": 790 } ], "animated": false, @@ -1379,19 +1379,11 @@ "labelPercentage": 0, "route": [ { - "x": 465.5, + "x": 207.73800659179688, "y": 78 }, { - "x": 465.5, - "y": 118 - }, - { - "x": 443.3330078125, - "y": 118 - }, - { - "x": 443.3330078125, + "x": 207.73800659179688, "y": 158 } ], @@ -1425,19 +1417,19 @@ "labelPercentage": 0, "route": [ { - "x": 394.5, + "x": 278.7380065917969, "y": 78 }, { - "x": 394.5, + "x": 278.7380065917969, "y": 118 }, { - "x": 416.6659851074219, + "x": 234.4040069580078, "y": 118 }, { - "x": 416.6659851074219, + "x": 234.4040069580078, "y": 158 } ], @@ -1471,20 +1463,20 @@ "labelPercentage": 0, "route": [ { - "x": 195.91600036621094, - "y": 656 + "x": 178.66600036621094, + "y": 856 }, { - "x": 195.91600036621094, - "y": 696 + "x": 178.66600036621094, + "y": 896 }, { - "x": 171.75, - "y": 696 + "x": 154.49899291992188, + "y": 896 }, { - "x": 171.75, - "y": 736 + "x": 154.49899291992188, + "y": 936 } ], "animated": false, @@ -1517,20 +1509,20 @@ "labelPercentage": 0, "route": [ { - "x": 222.58299255371094, - "y": 656 + "x": 205.33299255371094, + "y": 856 }, { - "x": 222.58299255371094, - "y": 696 + "x": 205.33299255371094, + "y": 896 }, { - "x": 246.75, - "y": 696 + "x": 229.5, + "y": 896 }, { - "x": 246.75, - "y": 736 + "x": 229.5, + "y": 936 } ], "animated": false, @@ -1563,20 +1555,20 @@ "labelPercentage": 0, "route": [ { - "x": 343.6659851074219, - "y": 656 + "x": 326.4159851074219, + "y": 856 }, { - "x": 343.6659851074219, - "y": 696 + "x": 326.4159851074219, + "y": 896 }, { - "x": 320.25, - "y": 696 + "x": 303, + "y": 896 }, { - "x": 320.25, - "y": 736 + "x": 303, + "y": 936 } ], "animated": false, @@ -1609,20 +1601,20 @@ "labelPercentage": 0, "route": [ { - "x": 370.3330078125, - "y": 656 + "x": 353.0830078125, + "y": 856 }, { - "x": 370.3330078125, - "y": 696 + "x": 353.0830078125, + "y": 896 }, { - "x": 393.75, - "y": 696 + "x": 376.5, + "y": 896 }, { - "x": 393.75, - "y": 736 + "x": 376.5, + "y": 936 } ], "animated": false, @@ -1655,20 +1647,20 @@ "labelPercentage": 0, "route": [ { - "x": 490.1659851074219, - "y": 656 + "x": 472.9159851074219, + "y": 856 }, { - "x": 490.1659851074219, - "y": 696 + "x": 472.9159851074219, + "y": 896 }, { - "x": 467.25, - "y": 696 + "x": 450, + "y": 896 }, { - "x": 467.25, - "y": 736 + "x": 450, + "y": 936 } ], "animated": false, @@ -1701,20 +1693,20 @@ "labelPercentage": 0, "route": [ { - "x": 516.8330078125, - "y": 656 + "x": 499.5830078125, + "y": 856 }, { - "x": 516.8330078125, - "y": 696 + "x": 499.5830078125, + "y": 896 }, { - "x": 539.75, - "y": 696 + "x": 522.5, + "y": 896 }, { - "x": 539.75, - "y": 736 + "x": 522.5, + "y": 936 } ], "animated": false, @@ -1747,12 +1739,12 @@ "labelPercentage": 0, "route": [ { - "x": 393.75, - "y": 802 + "x": 376.5, + "y": 1002 }, { - "x": 393.75, - "y": 872 + "x": 376.5, + "y": 1072 } ], "animated": false, @@ -1785,20 +1777,20 @@ "labelPercentage": 0, "route": [ { - "x": 633.666015625, - "y": 656 + "x": 616.416015625, + "y": 856 }, { - "x": 633.666015625, - "y": 696 + "x": 616.416015625, + "y": 896 }, { - "x": 610.75, - "y": 696 + "x": 593.5, + "y": 896 }, { - "x": 610.75, - "y": 736 + "x": 593.5, + "y": 936 } ], "animated": false, @@ -1831,20 +1823,20 @@ "labelPercentage": 0, "route": [ { - "x": 660.3330078125, - "y": 656 + "x": 643.0830078125, + "y": 856 }, { - "x": 660.3330078125, - "y": 696 + "x": 643.0830078125, + "y": 896 }, { - "x": 683.25, - "y": 696 + "x": 666, + "y": 896 }, { - "x": 683.25, - "y": 736 + "x": 666, + "y": 936 } ], "animated": false, @@ -1877,20 +1869,20 @@ "labelPercentage": 0, "route": [ { - "x": 744.5, + "x": 727.25, "y": 360 }, { - "x": 744.5, + "x": 727.25, "y": 400 }, { - "x": 767, + "x": 749.75, "y": 400 }, { - "x": 767, - "y": 590 + "x": 749.75, + "y": 790 } ], "animated": false, @@ -1923,20 +1915,20 @@ "labelPercentage": 0, "route": [ { - "x": 820.5, + "x": 803.25, "y": 360 }, { - "x": 820.5, + "x": 803.25, "y": 400 }, { - "x": 797, + "x": 779.75, "y": 400 }, { - "x": 797, - "y": 590 + "x": 779.75, + "y": 790 } ], "animated": false, diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index a776cc3501..266af4c302 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - - + .d2-349262092 .fill-N1{fill:#0A0F25;} + .d2-349262092 .fill-N2{fill:#676C7E;} + .d2-349262092 .fill-N3{fill:#9499AB;} + .d2-349262092 .fill-N4{fill:#CFD2DD;} + .d2-349262092 .fill-N5{fill:#DEE1EB;} + .d2-349262092 .fill-N6{fill:#EEF1F8;} + .d2-349262092 .fill-N7{fill:#FFFFFF;} + .d2-349262092 .fill-B1{fill:#0D32B2;} + .d2-349262092 .fill-B2{fill:#0D32B2;} + .d2-349262092 .fill-B3{fill:#E3E9FD;} + .d2-349262092 .fill-B4{fill:#E3E9FD;} + .d2-349262092 .fill-B5{fill:#EDF0FD;} + .d2-349262092 .fill-B6{fill:#F7F8FE;} + .d2-349262092 .fill-AA2{fill:#4A6FF3;} + .d2-349262092 .fill-AA4{fill:#EDF0FD;} + .d2-349262092 .fill-AA5{fill:#F7F8FE;} + .d2-349262092 .fill-AB4{fill:#EDF0FD;} + .d2-349262092 .fill-AB5{fill:#F7F8FE;} + .d2-349262092 .stroke-N1{stroke:#0A0F25;} + .d2-349262092 .stroke-N2{stroke:#676C7E;} + .d2-349262092 .stroke-N3{stroke:#9499AB;} + .d2-349262092 .stroke-N4{stroke:#CFD2DD;} + .d2-349262092 .stroke-N5{stroke:#DEE1EB;} + .d2-349262092 .stroke-N6{stroke:#EEF1F8;} + .d2-349262092 .stroke-N7{stroke:#FFFFFF;} + .d2-349262092 .stroke-B1{stroke:#0D32B2;} + .d2-349262092 .stroke-B2{stroke:#0D32B2;} + .d2-349262092 .stroke-B3{stroke:#E3E9FD;} + .d2-349262092 .stroke-B4{stroke:#E3E9FD;} + .d2-349262092 .stroke-B5{stroke:#EDF0FD;} + .d2-349262092 .stroke-B6{stroke:#F7F8FE;} + .d2-349262092 .stroke-AA2{stroke:#4A6FF3;} + .d2-349262092 .stroke-AA4{stroke:#EDF0FD;} + .d2-349262092 .stroke-AA5{stroke:#F7F8FE;} + .d2-349262092 .stroke-AB4{stroke:#EDF0FD;} + .d2-349262092 .stroke-AB5{stroke:#F7F8FE;} + .d2-349262092 .background-color-N1{background-color:#0A0F25;} + .d2-349262092 .background-color-N2{background-color:#676C7E;} + .d2-349262092 .background-color-N3{background-color:#9499AB;} + .d2-349262092 .background-color-N4{background-color:#CFD2DD;} + .d2-349262092 .background-color-N5{background-color:#DEE1EB;} + .d2-349262092 .background-color-N6{background-color:#EEF1F8;} + .d2-349262092 .background-color-N7{background-color:#FFFFFF;} + .d2-349262092 .background-color-B1{background-color:#0D32B2;} + .d2-349262092 .background-color-B2{background-color:#0D32B2;} + .d2-349262092 .background-color-B3{background-color:#E3E9FD;} + .d2-349262092 .background-color-B4{background-color:#E3E9FD;} + .d2-349262092 .background-color-B5{background-color:#EDF0FD;} + .d2-349262092 .background-color-B6{background-color:#F7F8FE;} + .d2-349262092 .background-color-AA2{background-color:#4A6FF3;} + .d2-349262092 .background-color-AA4{background-color:#EDF0FD;} + .d2-349262092 .background-color-AA5{background-color:#F7F8FE;} + .d2-349262092 .background-color-AB4{background-color:#EDF0FD;} + .d2-349262092 .background-color-AB5{background-color:#F7F8FE;} + .d2-349262092 .color-N1{color:#0A0F25;} + .d2-349262092 .color-N2{color:#676C7E;} + .d2-349262092 .color-N3{color:#9499AB;} + .d2-349262092 .color-N4{color:#CFD2DD;} + .d2-349262092 .color-N5{color:#DEE1EB;} + .d2-349262092 .color-N6{color:#EEF1F8;} + .d2-349262092 .color-N7{color:#FFFFFF;} + .d2-349262092 .color-B1{color:#0D32B2;} + .d2-349262092 .color-B2{color:#0D32B2;} + .d2-349262092 .color-B3{color:#E3E9FD;} + .d2-349262092 .color-B4{color:#E3E9FD;} + .d2-349262092 .color-B5{color:#EDF0FD;} + .d2-349262092 .color-B6{color:#F7F8FE;} + .d2-349262092 .color-AA2{color:#4A6FF3;} + .d2-349262092 .color-AA4{color:#EDF0FD;} + .d2-349262092 .color-AA5{color:#F7F8FE;} + .d2-349262092 .color-AB4{color:#EDF0FD;} + .d2-349262092 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstuvw + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index fdd25bc6b3..0207a7948a 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -7,8 +7,8 @@ "id": "a", "type": "rectangle", "pos": { - "x": 413, - "y": 882 + "x": 148, + "y": 1032 }, "width": 160, "height": 66, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 553, - "y": 1174 + "x": 212, + "y": 1424 }, "width": 120, "height": 66, @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 464, + "x": 12, "y": 294 }, "width": 120, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 553, - "y": 686 + "x": 370, + "y": 636 }, "width": 120, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 666, - "y": 882 + "x": 391, + "y": 1032 }, "width": 80, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 726, - "y": 1028 + "x": 37, + "y": 1228 }, "width": 120, "height": 66, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 658, + "x": 84, "y": 12 }, "width": 80, @@ -294,7 +294,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 840, + "x": 150, "y": 158 }, "width": 53, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 842, + "x": 152, "y": 294 }, "width": 49, @@ -376,8 +376,8 @@ "id": "j", "type": "rectangle", "pos": { - "x": 827, - "y": 540 + "x": 136, + "y": 490 }, "width": 80, "height": 66, @@ -417,8 +417,8 @@ "id": "k", "type": "rectangle", "pos": { - "x": 693, - "y": 686 + "x": 510, + "y": 636 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 12, - "y": 882 + "x": 570, + "y": 1032 }, "width": 80, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 75, - "y": 1174 + "x": 636, + "y": 1424 }, "width": 120, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 22, - "y": 686 + "x": 583, + "y": 636 }, "width": 200, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 196, - "y": 882 + "x": 803, + "y": 1032 }, "width": 80, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 173, - "y": 1028 + "x": 783, + "y": 1228 }, "width": 120, "height": 66, @@ -663,7 +663,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 217, + "x": 762, "y": 12 }, "width": 80, @@ -704,7 +704,7 @@ "id": "r", "type": "rectangle", "pos": { - "x": 354, + "x": 863, "y": 158 }, "width": 51, @@ -745,7 +745,7 @@ "id": "s", "type": "rectangle", "pos": { - "x": 340, + "x": 848, "y": 294 }, "width": 80, @@ -786,8 +786,8 @@ "id": "t", "type": "rectangle", "pos": { - "x": 315, - "y": 540 + "x": 848, + "y": 490 }, "width": 80, "height": 66, @@ -827,8 +827,8 @@ "id": "u", "type": "rectangle", "pos": { - "x": 357, - "y": 686 + "x": 803, + "y": 636 }, "width": 80, "height": 66, @@ -891,20 +891,12 @@ "labelPercentage": 0, "route": [ { - "x": 493.3330078125, - "y": 948 - }, - { - "x": 493.3330078125, - "y": 1134 - }, - { - "x": 583.3330078125, - "y": 1134 + "x": 272.25, + "y": 1098 }, { - "x": 583.3330078125, - "y": 1174 + "x": 272.25, + "y": 1424 } ], "animated": false, @@ -937,20 +929,20 @@ "labelPercentage": 0, "route": [ { - "x": 524.3330078125, + "x": 72, "y": 360 }, { - "x": 524.3330078125, - "y": 500 + "x": 72, + "y": 742 }, { - "x": 509.3330078125, - "y": 500 + "x": 180, + "y": 742 }, { - "x": 509.3330078125, - "y": 882 + "x": 180, + "y": 1032 } ], "animated": false, @@ -983,20 +975,20 @@ "labelPercentage": 0, "route": [ { - "x": 583.3330078125, - "y": 752 + "x": 400.5830078125, + "y": 702 }, { - "x": 583.3330078125, + "x": 400.5830078125, "y": 792 }, { - "x": 541.3330078125, + "x": 244, "y": 792 }, { - "x": 541.3330078125, - "y": 882 + "x": 244, + "y": 1032 } ], "animated": false, @@ -1029,12 +1021,28 @@ "labelPercentage": 0, "route": [ { - "x": 613.3330078125, - "y": 752 + "x": 460.5830078125, + "y": 702 + }, + { + "x": 460.5830078125, + "y": 992 + }, + { + "x": 521.5830078125, + "y": 992 }, { - "x": 613.3330078125, - "y": 1174 + "x": 521.5830078125, + "y": 1334 + }, + { + "x": 302.25, + "y": 1334 + }, + { + "x": 302.25, + "y": 1424 } ], "animated": false, @@ -1067,20 +1075,20 @@ "labelPercentage": 0, "route": [ { - "x": 643.3330078125, - "y": 752 + "x": 430.5830078125, + "y": 702 }, { - "x": 643.3330078125, - "y": 792 + "x": 430.5830078125, + "y": 892 }, { - "x": 693.166015625, - "y": 792 + "x": 418.25, + "y": 892 }, { - "x": 693.166015625, - "y": 882 + "x": 418.25, + "y": 1032 } ], "animated": false, @@ -1113,20 +1121,20 @@ "labelPercentage": 0, "route": [ { - "x": 706.5, - "y": 948 + "x": 431.5830078125, + "y": 1098 }, { - "x": 706.5, - "y": 988 + "x": 431.5830078125, + "y": 1138 }, { - "x": 756.4990234375, - "y": 988 + "x": 127.2490005493164, + "y": 1138 }, { - "x": 756.4990234375, - "y": 1028 + "x": 127.2490005493164, + "y": 1228 } ], "animated": false, @@ -1159,20 +1167,20 @@ "labelPercentage": 0, "route": [ { - "x": 786.4990234375, - "y": 1094 + "x": 97.2490005493164, + "y": 1294 }, { - "x": 786.4990234375, - "y": 1134 + "x": 97.2490005493164, + "y": 1334 }, { - "x": 643.3330078125, - "y": 1134 + "x": 242.25, + "y": 1334 }, { - "x": 643.3330078125, - "y": 1174 + "x": 242.25, + "y": 1424 } ], "animated": false, @@ -1205,20 +1213,20 @@ "labelPercentage": 0, "route": [ { - "x": 554.3330078125, + "x": 36.5, "y": 360 }, { - "x": 554.3330078125, - "y": 400 + "x": 36.5, + "y": 1188 }, { - "x": 786.4990234375, - "y": 400 + "x": 67.2490005493164, + "y": 1188 }, { - "x": 786.4990234375, - "y": 1028 + "x": 67.2490005493164, + "y": 1228 } ], "animated": false, @@ -1251,19 +1259,11 @@ "labelPercentage": 0, "route": [ { - "x": 685.0830078125, + "x": 110.91600036621094, "y": 78 }, { - "x": 685.0830078125, - "y": 118 - }, - { - "x": 524.3330078125, - "y": 118 - }, - { - "x": 524.3330078125, + "x": 110.91600036621094, "y": 294 } ], @@ -1297,19 +1297,19 @@ "labelPercentage": 0, "route": [ { - "x": 711.75, + "x": 137.58299255371094, "y": 78 }, { - "x": 711.75, + "x": 137.58299255371094, "y": 118 }, { - "x": 867.4990234375, + "x": 176.5, "y": 118 }, { - "x": 867.4990234375, + "x": 176.5, "y": 158 } ], @@ -1343,11 +1343,11 @@ "labelPercentage": 0, "route": [ { - "x": 867.4990234375, + "x": 176.5, "y": 224 }, { - "x": 867.4990234375, + "x": 176.5, "y": 294 } ], @@ -1381,12 +1381,12 @@ "labelPercentage": 0, "route": [ { - "x": 867.4990234375, + "x": 176.5, "y": 360 }, { - "x": 867.4990234375, - "y": 540 + "x": 176.5, + "y": 490 } ], "animated": false, @@ -1419,20 +1419,20 @@ "labelPercentage": 0, "route": [ { - "x": 854.166015625, - "y": 606 + "x": 189.83299255371094, + "y": 556 }, { - "x": 854.166015625, - "y": 646 + "x": 189.83299255371094, + "y": 596 }, { - "x": 719.8330078125, - "y": 646 + "x": 537.0830078125, + "y": 596 }, { - "x": 719.8330078125, - "y": 686 + "x": 537.0830078125, + "y": 636 } ], "animated": false, @@ -1465,12 +1465,20 @@ "labelPercentage": 0, "route": [ { - "x": 719.8330078125, - "y": 752 + "x": 537.0830078125, + "y": 702 + }, + { + "x": 537.0830078125, + "y": 942 + }, + { + "x": 444.9159851074219, + "y": 942 }, { - "x": 719.8330078125, - "y": 882 + "x": 444.9159851074219, + "y": 1032 } ], "animated": false, @@ -1503,20 +1511,28 @@ "labelPercentage": 0, "route": [ { - "x": 880.8330078125, - "y": 606 + "x": 163.16600036621094, + "y": 556 }, { - "x": 880.8330078125, - "y": 988 + "x": 163.16600036621094, + "y": 596 }, { - "x": 816.4990234375, - "y": 988 + "x": 57, + "y": 596 }, { - "x": 816.4990234375, - "y": 1028 + "x": 57, + "y": 1138 + }, + { + "x": 97.2490005493164, + "y": 1138 + }, + { + "x": 97.2490005493164, + "y": 1228 } ], "animated": false, @@ -1549,20 +1565,20 @@ "labelPercentage": 0, "route": [ { - "x": 52, - "y": 948 + "x": 610.416015625, + "y": 1098 }, { - "x": 52, - "y": 1134 + "x": 610.416015625, + "y": 1384 }, { - "x": 105.33300018310547, - "y": 1134 + "x": 666.916015625, + "y": 1384 }, { - "x": 105.33300018310547, - "y": 1174 + "x": 666.916015625, + "y": 1424 } ], "animated": false, @@ -1595,12 +1611,20 @@ "labelPercentage": 0, "route": [ { - "x": 38.66600036621094, - "y": 752 + "x": 650.25, + "y": 702 }, { - "x": 38.66600036621094, - "y": 882 + "x": 650.25, + "y": 892 + }, + { + "x": 623.75, + "y": 892 + }, + { + "x": 623.75, + "y": 1032 } ], "animated": false, @@ -1633,12 +1657,20 @@ "labelPercentage": 0, "route": [ { - "x": 65.33300018310547, - "y": 752 + "x": 616.916015625, + "y": 702 + }, + { + "x": 616.916015625, + "y": 742 + }, + { + "x": 597.0830078125, + "y": 742 }, { - "x": 65.33300018310547, - "y": 882 + "x": 597.0830078125, + "y": 1032 } ], "animated": false, @@ -1671,20 +1703,12 @@ "labelPercentage": 0, "route": [ { - "x": 122, - "y": 752 - }, - { - "x": 122, - "y": 842 + "x": 690.416015625, + "y": 702 }, { - "x": 132, - "y": 842 - }, - { - "x": 132, - "y": 1174 + "x": 690.416015625, + "y": 1424 } ], "animated": false, @@ -1717,20 +1741,20 @@ "labelPercentage": 0, "route": [ { - "x": 188.66600036621094, - "y": 752 + "x": 750.25, + "y": 702 }, { - "x": 188.66600036621094, - "y": 792 + "x": 750.25, + "y": 892 }, { - "x": 222.99899291992188, - "y": 792 + "x": 830.25, + "y": 892 }, { - "x": 222.99899291992188, - "y": 882 + "x": 830.25, + "y": 1032 } ], "animated": false, @@ -1763,12 +1787,12 @@ "labelPercentage": 0, "route": [ { - "x": 233, - "y": 948 + "x": 843.5830078125, + "y": 1098 }, { - "x": 233, - "y": 1028 + "x": 843.5830078125, + "y": 1228 } ], "animated": false, @@ -1801,20 +1825,20 @@ "labelPercentage": 0, "route": [ { - "x": 233, - "y": 1094 + "x": 843.5830078125, + "y": 1294 }, { - "x": 233, - "y": 1134 + "x": 843.5830078125, + "y": 1334 }, { - "x": 165.33299255371094, - "y": 1134 + "x": 726.916015625, + "y": 1334 }, { - "x": 165.33299255371094, - "y": 1174 + "x": 726.916015625, + "y": 1424 } ], "animated": false, @@ -1847,20 +1871,20 @@ "labelPercentage": 0, "route": [ { - "x": 150.83299255371094, - "y": 752 + "x": 716.916015625, + "y": 702 }, { - "x": 150.83299255371094, - "y": 988 + "x": 716.916015625, + "y": 1138 }, { - "x": 203, - "y": 988 + "x": 813.5830078125, + "y": 1138 }, { - "x": 203, - "y": 1028 + "x": 813.5830078125, + "y": 1228 } ], "animated": false, @@ -1893,20 +1917,20 @@ "labelPercentage": 0, "route": [ { - "x": 243.99899291992188, + "x": 788.75, "y": 78 }, { - "x": 243.99899291992188, + "x": 788.75, "y": 118 }, { - "x": 122, + "x": 683.5830078125, "y": 118 }, { - "x": 122, - "y": 686 + "x": 683.5830078125, + "y": 636 } ], "animated": false, @@ -1939,19 +1963,19 @@ "labelPercentage": 0, "route": [ { - "x": 270.6659851074219, + "x": 815.416015625, "y": 78 }, { - "x": 270.6659851074219, + "x": 815.416015625, "y": 118 }, { - "x": 380, + "x": 888.75, "y": 118 }, { - "x": 380, + "x": 888.75, "y": 158 } ], @@ -1985,11 +2009,11 @@ "labelPercentage": 0, "route": [ { - "x": 380, + "x": 888.75, "y": 224 }, { - "x": 380, + "x": 888.75, "y": 294 } ], @@ -2023,20 +2047,12 @@ "labelPercentage": 0, "route": [ { - "x": 366.6659851074219, + "x": 902.0830078125, "y": 360 }, { - "x": 366.6659851074219, - "y": 400 - }, - { - "x": 341.8330078125, - "y": 400 - }, - { - "x": 341.8330078125, - "y": 540 + "x": 902.0830078125, + "y": 490 } ], "animated": false, @@ -2069,12 +2085,20 @@ "labelPercentage": 0, "route": [ { - "x": 368.4989929199219, - "y": 606 + "x": 875.416015625, + "y": 556 + }, + { + "x": 875.416015625, + "y": 596 }, { - "x": 368.4989929199219, - "y": 686 + "x": 843.5830078125, + "y": 596 + }, + { + "x": 843.5830078125, + "y": 636 } ], "animated": false, @@ -2107,20 +2131,12 @@ "labelPercentage": 0, "route": [ { - "x": 383.9989929199219, - "y": 752 - }, - { - "x": 383.9989929199219, - "y": 792 + "x": 856.916015625, + "y": 702 }, { - "x": 249.66600036621094, - "y": 792 - }, - { - "x": 249.66600036621094, - "y": 882 + "x": 856.916015625, + "y": 1032 } ], "animated": false, @@ -2153,28 +2169,28 @@ "labelPercentage": 0, "route": [ { - "x": 341.8330078125, - "y": 606 + "x": 902.0830078125, + "y": 556 }, { - "x": 341.8330078125, - "y": 646 + "x": 902.0830078125, + "y": 596 }, { - "x": 316.3330078125, - "y": 646 + "x": 923.5830078125, + "y": 596 }, { - "x": 316.3330078125, - "y": 988 + "x": 923.5830078125, + "y": 1138 }, { - "x": 263, - "y": 988 + "x": 873.5830078125, + "y": 1138 }, { - "x": 263, - "y": 1028 + "x": 873.5830078125, + "y": 1228 } ], "animated": false, @@ -2207,20 +2223,20 @@ "labelPercentage": 0, "route": [ { - "x": 494.3330078125, + "x": 102, "y": 360 }, { - "x": 494.3330078125, + "x": 102, "y": 450 }, { - "x": 368.4989929199219, + "x": 875.416015625, "y": 450 }, { - "x": 368.4989929199219, - "y": 540 + "x": 875.416015625, + "y": 490 } ], "animated": false, @@ -2253,20 +2269,28 @@ "labelPercentage": 0, "route": [ { - "x": 393.3330078125, + "x": 875.416015625, "y": 360 }, { - "x": 393.3330078125, - "y": 500 + "x": 875.416015625, + "y": 400 + }, + { + "x": 256.5, + "y": 400 + }, + { + "x": 256.5, + "y": 742 }, { - "x": 477.3330078125, - "y": 500 + "x": 212, + "y": 742 }, { - "x": 477.3330078125, - "y": 882 + "x": 212, + "y": 1032 } ], "animated": false, @@ -2299,20 +2323,20 @@ "labelPercentage": 0, "route": [ { - "x": 410.6659851074219, - "y": 752 + "x": 830.25, + "y": 702 }, { - "x": 410.6659851074219, - "y": 792 + "x": 830.25, + "y": 842 }, { - "x": 445.3330078125, - "y": 792 + "x": 276, + "y": 842 }, { - "x": 445.3330078125, - "y": 882 + "x": 276, + "y": 1032 } ], "animated": false, diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index f3f94f8931..553f4db6c4 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - - + .d2-1920498500 .fill-N1{fill:#0A0F25;} + .d2-1920498500 .fill-N2{fill:#676C7E;} + .d2-1920498500 .fill-N3{fill:#9499AB;} + .d2-1920498500 .fill-N4{fill:#CFD2DD;} + .d2-1920498500 .fill-N5{fill:#DEE1EB;} + .d2-1920498500 .fill-N6{fill:#EEF1F8;} + .d2-1920498500 .fill-N7{fill:#FFFFFF;} + .d2-1920498500 .fill-B1{fill:#0D32B2;} + .d2-1920498500 .fill-B2{fill:#0D32B2;} + .d2-1920498500 .fill-B3{fill:#E3E9FD;} + .d2-1920498500 .fill-B4{fill:#E3E9FD;} + .d2-1920498500 .fill-B5{fill:#EDF0FD;} + .d2-1920498500 .fill-B6{fill:#F7F8FE;} + .d2-1920498500 .fill-AA2{fill:#4A6FF3;} + .d2-1920498500 .fill-AA4{fill:#EDF0FD;} + .d2-1920498500 .fill-AA5{fill:#F7F8FE;} + .d2-1920498500 .fill-AB4{fill:#EDF0FD;} + .d2-1920498500 .fill-AB5{fill:#F7F8FE;} + .d2-1920498500 .stroke-N1{stroke:#0A0F25;} + .d2-1920498500 .stroke-N2{stroke:#676C7E;} + .d2-1920498500 .stroke-N3{stroke:#9499AB;} + .d2-1920498500 .stroke-N4{stroke:#CFD2DD;} + .d2-1920498500 .stroke-N5{stroke:#DEE1EB;} + .d2-1920498500 .stroke-N6{stroke:#EEF1F8;} + .d2-1920498500 .stroke-N7{stroke:#FFFFFF;} + .d2-1920498500 .stroke-B1{stroke:#0D32B2;} + .d2-1920498500 .stroke-B2{stroke:#0D32B2;} + .d2-1920498500 .stroke-B3{stroke:#E3E9FD;} + .d2-1920498500 .stroke-B4{stroke:#E3E9FD;} + .d2-1920498500 .stroke-B5{stroke:#EDF0FD;} + .d2-1920498500 .stroke-B6{stroke:#F7F8FE;} + .d2-1920498500 .stroke-AA2{stroke:#4A6FF3;} + .d2-1920498500 .stroke-AA4{stroke:#EDF0FD;} + .d2-1920498500 .stroke-AA5{stroke:#F7F8FE;} + .d2-1920498500 .stroke-AB4{stroke:#EDF0FD;} + .d2-1920498500 .stroke-AB5{stroke:#F7F8FE;} + .d2-1920498500 .background-color-N1{background-color:#0A0F25;} + .d2-1920498500 .background-color-N2{background-color:#676C7E;} + .d2-1920498500 .background-color-N3{background-color:#9499AB;} + .d2-1920498500 .background-color-N4{background-color:#CFD2DD;} + .d2-1920498500 .background-color-N5{background-color:#DEE1EB;} + .d2-1920498500 .background-color-N6{background-color:#EEF1F8;} + .d2-1920498500 .background-color-N7{background-color:#FFFFFF;} + .d2-1920498500 .background-color-B1{background-color:#0D32B2;} + .d2-1920498500 .background-color-B2{background-color:#0D32B2;} + .d2-1920498500 .background-color-B3{background-color:#E3E9FD;} + .d2-1920498500 .background-color-B4{background-color:#E3E9FD;} + .d2-1920498500 .background-color-B5{background-color:#EDF0FD;} + .d2-1920498500 .background-color-B6{background-color:#F7F8FE;} + .d2-1920498500 .background-color-AA2{background-color:#4A6FF3;} + .d2-1920498500 .background-color-AA4{background-color:#EDF0FD;} + .d2-1920498500 .background-color-AA5{background-color:#F7F8FE;} + .d2-1920498500 .background-color-AB4{background-color:#EDF0FD;} + .d2-1920498500 .background-color-AB5{background-color:#F7F8FE;} + .d2-1920498500 .color-N1{color:#0A0F25;} + .d2-1920498500 .color-N2{color:#676C7E;} + .d2-1920498500 .color-N3{color:#9499AB;} + .d2-1920498500 .color-N4{color:#CFD2DD;} + .d2-1920498500 .color-N5{color:#DEE1EB;} + .d2-1920498500 .color-N6{color:#EEF1F8;} + .d2-1920498500 .color-N7{color:#FFFFFF;} + .d2-1920498500 .color-B1{color:#0D32B2;} + .d2-1920498500 .color-B2{color:#0D32B2;} + .d2-1920498500 .color-B3{color:#E3E9FD;} + .d2-1920498500 .color-B4{color:#E3E9FD;} + .d2-1920498500 .color-B5{color:#EDF0FD;} + .d2-1920498500 .color-B6{color:#F7F8FE;} + .d2-1920498500 .color-AA2{color:#4A6FF3;} + .d2-1920498500 .color-AA4{color:#EDF0FD;} + .d2-1920498500 .color-AA5{color:#F7F8FE;} + .d2-1920498500 .color-AB4{color:#EDF0FD;} + .d2-1920498500 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstu + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index 3eefbf9fd9..97689c3a82 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 12, + "x": 19, "y": 12 }, "width": 226, @@ -48,7 +48,7 @@ "id": "a.b", "type": "rectangle", "pos": { - "x": 62, + "x": 69, "y": 62 }, "width": 53, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 92, - "y": 731 + "x": 55, + "y": 781 }, "width": 120, "height": 66, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 198, + "x": 148, "y": 585 }, "width": 54, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 127, + "x": 12, "y": 449 }, "width": 53, @@ -212,7 +212,7 @@ "id": "f", "type": "rectangle", "pos": { - "x": 200, + "x": 150, "y": 449 }, "width": 51, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 198, + "x": 148, "y": 313 }, "width": 54, @@ -294,7 +294,7 @@ "id": "a.h", "type": "rectangle", "pos": { - "x": 135, + "x": 142, "y": 62 }, "width": 53, @@ -358,20 +358,20 @@ "labelPercentage": 0, "route": [ { - "x": 78.5, + "x": 96, "y": 128 }, { - "x": 78.5, - "y": 691 + "x": 96, + "y": 273 }, { - "x": 122.75, - "y": 691 + "x": 105, + "y": 273 }, { - "x": 122.75, - "y": 731 + "x": 105, + "y": 781 } ], "animated": false, @@ -404,20 +404,20 @@ "labelPercentage": 0, "route": [ { - "x": 225.75, + "x": 175.5, "y": 651 }, { - "x": 225.75, + "x": 175.5, "y": 691 }, { - "x": 182.75, + "x": 145, "y": 691 }, { - "x": 182.75, - "y": 731 + "x": 145, + "y": 781 } ], "animated": false, @@ -450,12 +450,20 @@ "labelPercentage": 0, "route": [ { - "x": 152.75, + "x": 38.5, "y": 515 }, { - "x": 152.75, - "y": 731 + "x": 38.5, + "y": 741 + }, + { + "x": 85, + "y": 741 + }, + { + "x": 85, + "y": 781 } ], "animated": false, @@ -488,11 +496,11 @@ "labelPercentage": 0, "route": [ { - "x": 225.75, + "x": 175.5, "y": 515 }, { - "x": 225.75, + "x": 175.5, "y": 585 } ], @@ -526,19 +534,11 @@ "labelPercentage": 0, "route": [ { - "x": 171.5, + "x": 38.5, "y": 178 }, { - "x": 171.5, - "y": 273 - }, - { - "x": 153.75, - "y": 273 - }, - { - "x": 153.75, + "x": 38.5, "y": 449 } ], @@ -572,11 +572,11 @@ "labelPercentage": 0, "route": [ { - "x": 225.75, + "x": 175.5, "y": 379 }, { - "x": 225.75, + "x": 175.5, "y": 449 } ], @@ -610,19 +610,11 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 175.5, "y": 128 }, { - "x": 161.5, - "y": 223 - }, - { - "x": 225.75, - "y": 223 - }, - { - "x": 225.75, + "x": 175.5, "y": 313 } ], diff --git a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg index a2ba6b6066..988acb6fec 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh - - - - - - - - - + .d2-477871402 .fill-N1{fill:#0A0F25;} + .d2-477871402 .fill-N2{fill:#676C7E;} + .d2-477871402 .fill-N3{fill:#9499AB;} + .d2-477871402 .fill-N4{fill:#CFD2DD;} + .d2-477871402 .fill-N5{fill:#DEE1EB;} + .d2-477871402 .fill-N6{fill:#EEF1F8;} + .d2-477871402 .fill-N7{fill:#FFFFFF;} + .d2-477871402 .fill-B1{fill:#0D32B2;} + .d2-477871402 .fill-B2{fill:#0D32B2;} + .d2-477871402 .fill-B3{fill:#E3E9FD;} + .d2-477871402 .fill-B4{fill:#E3E9FD;} + .d2-477871402 .fill-B5{fill:#EDF0FD;} + .d2-477871402 .fill-B6{fill:#F7F8FE;} + .d2-477871402 .fill-AA2{fill:#4A6FF3;} + .d2-477871402 .fill-AA4{fill:#EDF0FD;} + .d2-477871402 .fill-AA5{fill:#F7F8FE;} + .d2-477871402 .fill-AB4{fill:#EDF0FD;} + .d2-477871402 .fill-AB5{fill:#F7F8FE;} + .d2-477871402 .stroke-N1{stroke:#0A0F25;} + .d2-477871402 .stroke-N2{stroke:#676C7E;} + .d2-477871402 .stroke-N3{stroke:#9499AB;} + .d2-477871402 .stroke-N4{stroke:#CFD2DD;} + .d2-477871402 .stroke-N5{stroke:#DEE1EB;} + .d2-477871402 .stroke-N6{stroke:#EEF1F8;} + .d2-477871402 .stroke-N7{stroke:#FFFFFF;} + .d2-477871402 .stroke-B1{stroke:#0D32B2;} + .d2-477871402 .stroke-B2{stroke:#0D32B2;} + .d2-477871402 .stroke-B3{stroke:#E3E9FD;} + .d2-477871402 .stroke-B4{stroke:#E3E9FD;} + .d2-477871402 .stroke-B5{stroke:#EDF0FD;} + .d2-477871402 .stroke-B6{stroke:#F7F8FE;} + .d2-477871402 .stroke-AA2{stroke:#4A6FF3;} + .d2-477871402 .stroke-AA4{stroke:#EDF0FD;} + .d2-477871402 .stroke-AA5{stroke:#F7F8FE;} + .d2-477871402 .stroke-AB4{stroke:#EDF0FD;} + .d2-477871402 .stroke-AB5{stroke:#F7F8FE;} + .d2-477871402 .background-color-N1{background-color:#0A0F25;} + .d2-477871402 .background-color-N2{background-color:#676C7E;} + .d2-477871402 .background-color-N3{background-color:#9499AB;} + .d2-477871402 .background-color-N4{background-color:#CFD2DD;} + .d2-477871402 .background-color-N5{background-color:#DEE1EB;} + .d2-477871402 .background-color-N6{background-color:#EEF1F8;} + .d2-477871402 .background-color-N7{background-color:#FFFFFF;} + .d2-477871402 .background-color-B1{background-color:#0D32B2;} + .d2-477871402 .background-color-B2{background-color:#0D32B2;} + .d2-477871402 .background-color-B3{background-color:#E3E9FD;} + .d2-477871402 .background-color-B4{background-color:#E3E9FD;} + .d2-477871402 .background-color-B5{background-color:#EDF0FD;} + .d2-477871402 .background-color-B6{background-color:#F7F8FE;} + .d2-477871402 .background-color-AA2{background-color:#4A6FF3;} + .d2-477871402 .background-color-AA4{background-color:#EDF0FD;} + .d2-477871402 .background-color-AA5{background-color:#F7F8FE;} + .d2-477871402 .background-color-AB4{background-color:#EDF0FD;} + .d2-477871402 .background-color-AB5{background-color:#F7F8FE;} + .d2-477871402 .color-N1{color:#0A0F25;} + .d2-477871402 .color-N2{color:#676C7E;} + .d2-477871402 .color-N3{color:#9499AB;} + .d2-477871402 .color-N4{color:#CFD2DD;} + .d2-477871402 .color-N5{color:#DEE1EB;} + .d2-477871402 .color-N6{color:#EEF1F8;} + .d2-477871402 .color-N7{color:#FFFFFF;} + .d2-477871402 .color-B1{color:#0D32B2;} + .d2-477871402 .color-B2{color:#0D32B2;} + .d2-477871402 .color-B3{color:#E3E9FD;} + .d2-477871402 .color-B4{color:#E3E9FD;} + .d2-477871402 .color-B5{color:#EDF0FD;} + .d2-477871402 .color-B6{color:#F7F8FE;} + .d2-477871402 .color-AA2{color:#4A6FF3;} + .d2-477871402 .color-AA4{color:#EDF0FD;} + .d2-477871402 .color-AA5{color:#F7F8FE;} + .d2-477871402 .color-AB4{color:#EDF0FD;} + .d2-477871402 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdefgbh + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json index d679787427..4be42ba2c1 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json @@ -153,20 +153,20 @@ "labelPercentage": 0, "route": [ { - "x": 55.5, + "x": 99, "y": 154 }, { - "x": 55.5, - "y": 294 + "x": 99, + "y": 244 }, { - "x": 136.73199462890625, - "y": 294 + "x": 159.58900451660156, + "y": 244 }, { - "x": 137, - "y": 354 + "x": 160, + "y": 339 } ], "animated": false, @@ -245,20 +245,20 @@ "labelPercentage": 0, "route": [ { - "x": 99, + "x": 142.5, "y": 154 }, { - "x": 99, - "y": 244 + "x": 142.5, + "y": 194 }, { - "x": 159.58900451660156, - "y": 244 + "x": 182.4459991455078, + "y": 194 }, { - "x": 160, - "y": 339 + "x": 182, + "y": 335 } ], "animated": false, @@ -383,19 +383,19 @@ "labelPercentage": 0, "route": [ { - "x": 182, - "y": 335 + "x": 137, + "y": 354 }, { - "x": 182.4459991455078, - "y": 194 + "x": 136.73199462890625, + "y": 294 }, { - "x": 142.5, - "y": 194 + "x": 55.5, + "y": 294 }, { - "x": 142.5, + "x": 55.5, "y": 154 } ], diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg index b2684e7618..c5db2ef49c 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + .d2-1242973379 .fill-N1{fill:#0A0F25;} + .d2-1242973379 .fill-N2{fill:#676C7E;} + .d2-1242973379 .fill-N3{fill:#9499AB;} + .d2-1242973379 .fill-N4{fill:#CFD2DD;} + .d2-1242973379 .fill-N5{fill:#DEE1EB;} + .d2-1242973379 .fill-N6{fill:#EEF1F8;} + .d2-1242973379 .fill-N7{fill:#FFFFFF;} + .d2-1242973379 .fill-B1{fill:#0D32B2;} + .d2-1242973379 .fill-B2{fill:#0D32B2;} + .d2-1242973379 .fill-B3{fill:#E3E9FD;} + .d2-1242973379 .fill-B4{fill:#E3E9FD;} + .d2-1242973379 .fill-B5{fill:#EDF0FD;} + .d2-1242973379 .fill-B6{fill:#F7F8FE;} + .d2-1242973379 .fill-AA2{fill:#4A6FF3;} + .d2-1242973379 .fill-AA4{fill:#EDF0FD;} + .d2-1242973379 .fill-AA5{fill:#F7F8FE;} + .d2-1242973379 .fill-AB4{fill:#EDF0FD;} + .d2-1242973379 .fill-AB5{fill:#F7F8FE;} + .d2-1242973379 .stroke-N1{stroke:#0A0F25;} + .d2-1242973379 .stroke-N2{stroke:#676C7E;} + .d2-1242973379 .stroke-N3{stroke:#9499AB;} + .d2-1242973379 .stroke-N4{stroke:#CFD2DD;} + .d2-1242973379 .stroke-N5{stroke:#DEE1EB;} + .d2-1242973379 .stroke-N6{stroke:#EEF1F8;} + .d2-1242973379 .stroke-N7{stroke:#FFFFFF;} + .d2-1242973379 .stroke-B1{stroke:#0D32B2;} + .d2-1242973379 .stroke-B2{stroke:#0D32B2;} + .d2-1242973379 .stroke-B3{stroke:#E3E9FD;} + .d2-1242973379 .stroke-B4{stroke:#E3E9FD;} + .d2-1242973379 .stroke-B5{stroke:#EDF0FD;} + .d2-1242973379 .stroke-B6{stroke:#F7F8FE;} + .d2-1242973379 .stroke-AA2{stroke:#4A6FF3;} + .d2-1242973379 .stroke-AA4{stroke:#EDF0FD;} + .d2-1242973379 .stroke-AA5{stroke:#F7F8FE;} + .d2-1242973379 .stroke-AB4{stroke:#EDF0FD;} + .d2-1242973379 .stroke-AB5{stroke:#F7F8FE;} + .d2-1242973379 .background-color-N1{background-color:#0A0F25;} + .d2-1242973379 .background-color-N2{background-color:#676C7E;} + .d2-1242973379 .background-color-N3{background-color:#9499AB;} + .d2-1242973379 .background-color-N4{background-color:#CFD2DD;} + .d2-1242973379 .background-color-N5{background-color:#DEE1EB;} + .d2-1242973379 .background-color-N6{background-color:#EEF1F8;} + .d2-1242973379 .background-color-N7{background-color:#FFFFFF;} + .d2-1242973379 .background-color-B1{background-color:#0D32B2;} + .d2-1242973379 .background-color-B2{background-color:#0D32B2;} + .d2-1242973379 .background-color-B3{background-color:#E3E9FD;} + .d2-1242973379 .background-color-B4{background-color:#E3E9FD;} + .d2-1242973379 .background-color-B5{background-color:#EDF0FD;} + .d2-1242973379 .background-color-B6{background-color:#F7F8FE;} + .d2-1242973379 .background-color-AA2{background-color:#4A6FF3;} + .d2-1242973379 .background-color-AA4{background-color:#EDF0FD;} + .d2-1242973379 .background-color-AA5{background-color:#F7F8FE;} + .d2-1242973379 .background-color-AB4{background-color:#EDF0FD;} + .d2-1242973379 .background-color-AB5{background-color:#F7F8FE;} + .d2-1242973379 .color-N1{color:#0A0F25;} + .d2-1242973379 .color-N2{color:#676C7E;} + .d2-1242973379 .color-N3{color:#9499AB;} + .d2-1242973379 .color-N4{color:#CFD2DD;} + .d2-1242973379 .color-N5{color:#DEE1EB;} + .d2-1242973379 .color-N6{color:#EEF1F8;} + .d2-1242973379 .color-N7{color:#FFFFFF;} + .d2-1242973379 .color-B1{color:#0D32B2;} + .d2-1242973379 .color-B2{color:#0D32B2;} + .d2-1242973379 .color-B3{color:#E3E9FD;} + .d2-1242973379 .color-B4{color:#E3E9FD;} + .d2-1242973379 .color-B5{color:#EDF0FD;} + .d2-1242973379 .color-B6{color:#F7F8FE;} + .d2-1242973379 .color-AA2{color:#4A6FF3;} + .d2-1242973379 .color-AA4{color:#EDF0FD;} + .d2-1242973379 .color-AA5{color:#F7F8FE;} + .d2-1242973379 .color-AB4{color:#EDF0FD;} + .d2-1242973379 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 9818a0916c..6a2fe4bcff 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 250, + "x": 296, "y": 12 }, "width": 53, @@ -48,7 +48,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 323, + "x": 369, "y": 12 }, "width": 53, @@ -89,7 +89,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 177, + "x": 442, "y": 12 }, "width": 53, @@ -130,11 +130,11 @@ "id": "l1", "type": "rectangle", "pos": { - "x": 127, - "y": 153 + "x": 173, + "y": 163 }, "width": 299, - "height": 296, + "height": 346, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -171,8 +171,8 @@ "id": "l1.b", "type": "rectangle", "pos": { - "x": 177, - "y": 203 + "x": 223, + "y": 213 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "l1.a", "type": "rectangle", "pos": { - "x": 250, - "y": 203 + "x": 296, + "y": 213 }, "width": 53, "height": 66, @@ -253,8 +253,8 @@ "id": "l1.c", "type": "rectangle", "pos": { - "x": 323, - "y": 203 + "x": 369, + "y": 213 }, "width": 53, "height": 66, @@ -294,8 +294,8 @@ "id": "l2c1", "type": "rectangle", "pos": { - "x": 12, - "y": 539 + "x": 16, + "y": 649 }, "width": 153, "height": 166, @@ -335,8 +335,8 @@ "id": "l2c1.a", "type": "rectangle", "pos": { - "x": 62, - "y": 589 + "x": 66, + "y": 699 }, "width": 53, "height": 66, @@ -376,8 +376,8 @@ "id": "l2c3", "type": "rectangle", "pos": { - "x": 408, - "y": 539 + "x": 262, + "y": 649 }, "width": 153, "height": 166, @@ -417,8 +417,8 @@ "id": "l2c3.c", "type": "rectangle", "pos": { - "x": 458, - "y": 589 + "x": 312, + "y": 699 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l2c2", "type": "rectangle", "pos": { - "x": 185, - "y": 539 + "x": 435, + "y": 649 }, "width": 153, "height": 166, @@ -499,8 +499,8 @@ "id": "l2c2.b", "type": "rectangle", "pos": { - "x": 235, - "y": 589 + "x": 485, + "y": 699 }, "width": 53, "height": 66, @@ -540,8 +540,8 @@ "id": "l3c1", "type": "rectangle", "pos": { - "x": 62, - "y": 795 + "x": 73, + "y": 955 }, "width": 226, "height": 166, @@ -581,8 +581,8 @@ "id": "l3c1.a", "type": "rectangle", "pos": { - "x": 112, - "y": 845 + "x": 123, + "y": 1005 }, "width": 53, "height": 66, @@ -622,8 +622,8 @@ "id": "l3c1.b", "type": "rectangle", "pos": { - "x": 185, - "y": 845 + "x": 196, + "y": 1005 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "l3c2", "type": "rectangle", "pos": { - "x": 408, - "y": 795 + "x": 358, + "y": 955 }, "width": 153, "height": 166, @@ -704,8 +704,8 @@ "id": "l3c2.c", "type": "rectangle", "pos": { - "x": 458, - "y": 845 + "x": 408, + "y": 1005 }, "width": 53, "height": 66, @@ -746,7 +746,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 1051 + "y": 1211 }, "width": 599, "height": 271, @@ -787,7 +787,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 1106 + "y": 1266 }, "width": 153, "height": 166, @@ -828,7 +828,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 1156 + "y": 1316 }, "width": 53, "height": 66, @@ -869,7 +869,7 @@ "type": "rectangle", "pos": { "x": 235, - "y": 1106 + "y": 1266 }, "width": 153, "height": 166, @@ -910,7 +910,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 1156 + "y": 1316 }, "width": 53, "height": 66, @@ -951,7 +951,7 @@ "type": "rectangle", "pos": { "x": 408, - "y": 1106 + "y": 1266 }, "width": 153, "height": 166, @@ -992,7 +992,7 @@ "type": "rectangle", "pos": { "x": 458, - "y": 1156 + "y": 1316 }, "width": 53, "height": 66, @@ -1055,12 +1055,20 @@ "labelPercentage": 0, "route": [ { - "x": 204.25, + "x": 469.25, "y": 78 }, { - "x": 204.25, - "y": 203 + "x": 469.25, + "y": 118 + }, + { + "x": 250.25, + "y": 118 + }, + { + "x": 250.25, + "y": 213 } ], "animated": false, @@ -1093,12 +1101,12 @@ "labelPercentage": 0, "route": [ { - "x": 277.25, + "x": 323.25, "y": 78 }, { - "x": 277.25, - "y": 203 + "x": 323.25, + "y": 213 } ], "animated": false, @@ -1131,12 +1139,12 @@ "labelPercentage": 0, "route": [ { - "x": 350.25, + "x": 396.25, "y": 78 }, { - "x": 350.25, - "y": 203 + "x": 396.25, + "y": 213 } ], "animated": false, @@ -1169,20 +1177,20 @@ "labelPercentage": 0, "route": [ { - "x": 277.25, - "y": 269 + "x": 323.25, + "y": 279 }, { - "x": 277.25, - "y": 494 + "x": 323.25, + "y": 319 }, { - "x": 88.5, - "y": 494 + "x": 93, + "y": 319 }, { - "x": 88.5, - "y": 589 + "x": 93, + "y": 699 } ], "animated": false, @@ -1215,20 +1223,28 @@ "labelPercentage": 0, "route": [ { - "x": 350.25, - "y": 269 + "x": 396.25, + "y": 279 }, { - "x": 350.25, - "y": 494 + "x": 396.25, + "y": 369 }, { - "x": 484.5, - "y": 494 + "x": 318.25, + "y": 369 }, { - "x": 484.5, - "y": 589 + "x": 318.25, + "y": 604 + }, + { + "x": 339, + "y": 604 + }, + { + "x": 339, + "y": 699 } ], "animated": false, @@ -1261,20 +1277,20 @@ "labelPercentage": 0, "route": [ { - "x": 204.25, - "y": 269 + "x": 250.25, + "y": 279 }, { - "x": 204.25, - "y": 359 + "x": 250.25, + "y": 554 }, { - "x": 245.75, - "y": 359 + "x": 512, + "y": 554 }, { - "x": 245.75, - "y": 589 + "x": 512, + "y": 699 } ], "animated": false, @@ -1307,20 +1323,20 @@ "labelPercentage": 0, "route": [ { - "x": 88.5, - "y": 655 + "x": 93, + "y": 765 }, { - "x": 88.5, - "y": 750 + "x": 93, + "y": 860 }, { - "x": 138.5, - "y": 750 + "x": 150, + "y": 860 }, { - "x": 138.5, - "y": 845 + "x": 150, + "y": 1005 } ], "animated": false, @@ -1353,20 +1369,20 @@ "labelPercentage": 0, "route": [ { - "x": 261.5, - "y": 655 + "x": 512, + "y": 765 }, { - "x": 261.5, - "y": 750 + "x": 512, + "y": 860 }, { - "x": 211.5, - "y": 750 + "x": 223, + "y": 860 }, { - "x": 211.5, - "y": 845 + "x": 223, + "y": 1005 } ], "animated": false, @@ -1399,12 +1415,20 @@ "labelPercentage": 0, "route": [ { - "x": 484.5, - "y": 655 + "x": 339, + "y": 765 }, { - "x": 484.5, - "y": 845 + "x": 339, + "y": 910 + }, + { + "x": 434.5, + "y": 910 + }, + { + "x": 434.5, + "y": 1005 } ], "animated": false, @@ -1438,11 +1462,11 @@ "route": [ { "x": 138.5, - "y": 911 + "y": 1071 }, { "x": 138.5, - "y": 1156 + "y": 1316 } ], "animated": false, @@ -1475,20 +1499,20 @@ "labelPercentage": 0, "route": [ { - "x": 211.5, - "y": 911 + "x": 223, + "y": 1071 }, { - "x": 211.5, - "y": 1006 + "x": 223, + "y": 1166 }, { "x": 311.5, - "y": 1006 + "y": 1166 }, { "x": 311.5, - "y": 1156 + "y": 1316 } ], "animated": false, @@ -1520,13 +1544,21 @@ "labelPosition": "", "labelPercentage": 0, "route": [ + { + "x": 434.5, + "y": 1071 + }, + { + "x": 434.5, + "y": 1166 + }, { "x": 484.5, - "y": 911 + "y": 1166 }, { "x": 484.5, - "y": 1156 + "y": 1316 } ], "animated": false, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index 99e38d8191..3b5925ec1f 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-2807834794 .fill-N1{fill:#0A0F25;} + .d2-2807834794 .fill-N2{fill:#676C7E;} + .d2-2807834794 .fill-N3{fill:#9499AB;} + .d2-2807834794 .fill-N4{fill:#CFD2DD;} + .d2-2807834794 .fill-N5{fill:#DEE1EB;} + .d2-2807834794 .fill-N6{fill:#EEF1F8;} + .d2-2807834794 .fill-N7{fill:#FFFFFF;} + .d2-2807834794 .fill-B1{fill:#0D32B2;} + .d2-2807834794 .fill-B2{fill:#0D32B2;} + .d2-2807834794 .fill-B3{fill:#E3E9FD;} + .d2-2807834794 .fill-B4{fill:#E3E9FD;} + .d2-2807834794 .fill-B5{fill:#EDF0FD;} + .d2-2807834794 .fill-B6{fill:#F7F8FE;} + .d2-2807834794 .fill-AA2{fill:#4A6FF3;} + .d2-2807834794 .fill-AA4{fill:#EDF0FD;} + .d2-2807834794 .fill-AA5{fill:#F7F8FE;} + .d2-2807834794 .fill-AB4{fill:#EDF0FD;} + .d2-2807834794 .fill-AB5{fill:#F7F8FE;} + .d2-2807834794 .stroke-N1{stroke:#0A0F25;} + .d2-2807834794 .stroke-N2{stroke:#676C7E;} + .d2-2807834794 .stroke-N3{stroke:#9499AB;} + .d2-2807834794 .stroke-N4{stroke:#CFD2DD;} + .d2-2807834794 .stroke-N5{stroke:#DEE1EB;} + .d2-2807834794 .stroke-N6{stroke:#EEF1F8;} + .d2-2807834794 .stroke-N7{stroke:#FFFFFF;} + .d2-2807834794 .stroke-B1{stroke:#0D32B2;} + .d2-2807834794 .stroke-B2{stroke:#0D32B2;} + .d2-2807834794 .stroke-B3{stroke:#E3E9FD;} + .d2-2807834794 .stroke-B4{stroke:#E3E9FD;} + .d2-2807834794 .stroke-B5{stroke:#EDF0FD;} + .d2-2807834794 .stroke-B6{stroke:#F7F8FE;} + .d2-2807834794 .stroke-AA2{stroke:#4A6FF3;} + .d2-2807834794 .stroke-AA4{stroke:#EDF0FD;} + .d2-2807834794 .stroke-AA5{stroke:#F7F8FE;} + .d2-2807834794 .stroke-AB4{stroke:#EDF0FD;} + .d2-2807834794 .stroke-AB5{stroke:#F7F8FE;} + .d2-2807834794 .background-color-N1{background-color:#0A0F25;} + .d2-2807834794 .background-color-N2{background-color:#676C7E;} + .d2-2807834794 .background-color-N3{background-color:#9499AB;} + .d2-2807834794 .background-color-N4{background-color:#CFD2DD;} + .d2-2807834794 .background-color-N5{background-color:#DEE1EB;} + .d2-2807834794 .background-color-N6{background-color:#EEF1F8;} + .d2-2807834794 .background-color-N7{background-color:#FFFFFF;} + .d2-2807834794 .background-color-B1{background-color:#0D32B2;} + .d2-2807834794 .background-color-B2{background-color:#0D32B2;} + .d2-2807834794 .background-color-B3{background-color:#E3E9FD;} + .d2-2807834794 .background-color-B4{background-color:#E3E9FD;} + .d2-2807834794 .background-color-B5{background-color:#EDF0FD;} + .d2-2807834794 .background-color-B6{background-color:#F7F8FE;} + .d2-2807834794 .background-color-AA2{background-color:#4A6FF3;} + .d2-2807834794 .background-color-AA4{background-color:#EDF0FD;} + .d2-2807834794 .background-color-AA5{background-color:#F7F8FE;} + .d2-2807834794 .background-color-AB4{background-color:#EDF0FD;} + .d2-2807834794 .background-color-AB5{background-color:#F7F8FE;} + .d2-2807834794 .color-N1{color:#0A0F25;} + .d2-2807834794 .color-N2{color:#676C7E;} + .d2-2807834794 .color-N3{color:#9499AB;} + .d2-2807834794 .color-N4{color:#CFD2DD;} + .d2-2807834794 .color-N5{color:#DEE1EB;} + .d2-2807834794 .color-N6{color:#EEF1F8;} + .d2-2807834794 .color-N7{color:#FFFFFF;} + .d2-2807834794 .color-B1{color:#0D32B2;} + .d2-2807834794 .color-B2{color:#0D32B2;} + .d2-2807834794 .color-B3{color:#E3E9FD;} + .d2-2807834794 .color-B4{color:#E3E9FD;} + .d2-2807834794 .color-B5{color:#EDF0FD;} + .d2-2807834794 .color-B6{color:#F7F8FE;} + .d2-2807834794 .color-AA2{color:#4A6FF3;} + .d2-2807834794 .color-AA4{color:#EDF0FD;} + .d2-2807834794 .color-AA5{color:#F7F8FE;} + .d2-2807834794 .color-AB4{color:#EDF0FD;} + .d2-2807834794 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json index 64178455dd..f091a888b5 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 166 + "y": 136 }, "width": 302, "height": 520, @@ -48,7 +48,7 @@ "type": "rectangle", "pos": { "x": 384, - "y": 121 + "y": 91 }, "width": 236, "height": 610, @@ -88,7 +88,7 @@ "type": "rectangle", "pos": { "x": 690, - "y": 274 + "y": 244 }, "width": 473, "height": 303, @@ -129,7 +129,7 @@ "type": "rectangle", "pos": { "x": 1945, - "y": 12 + "y": 419 }, "width": 820, "height": 212, @@ -170,7 +170,7 @@ "type": "rectangle", "pos": { "x": 1293, - "y": 149 + "y": 12 }, "width": 582, "height": 344, @@ -211,7 +211,7 @@ "type": "rectangle", "pos": { "x": 1293, - "y": 513 + "y": 376 }, "width": 201, "height": 118, @@ -264,7 +264,7 @@ "type": "oval", "pos": { "x": 72, - "y": 226 + "y": 196 }, "width": 182, "height": 182, @@ -317,7 +317,7 @@ "type": "oval", "pos": { "x": 72, - "y": 448 + "y": 418 }, "width": 182, "height": 178, @@ -370,7 +370,7 @@ "type": "rectangle", "pos": { "x": 444, - "y": 181 + "y": 151 }, "width": 116, "height": 66, @@ -411,7 +411,7 @@ "type": "rectangle", "pos": { "x": 444, - "y": 287 + "y": 257 }, "width": 116, "height": 66, @@ -452,7 +452,7 @@ "type": "rectangle", "pos": { "x": 444, - "y": 393 + "y": 363 }, "width": 116, "height": 66, @@ -493,7 +493,7 @@ "type": "rectangle", "pos": { "x": 444, - "y": 499 + "y": 469 }, "width": 116, "height": 66, @@ -534,7 +534,7 @@ "type": "rectangle", "pos": { "x": 444, - "y": 605 + "y": 575 }, "width": 116, "height": 66, @@ -575,7 +575,7 @@ "type": "text", "pos": { "x": 750, - "y": 334 + "y": 304 }, "width": 353, "height": 51, @@ -615,7 +615,7 @@ "type": "rectangle", "pos": { "x": 750, - "y": 425 + "y": 395 }, "width": 140, "height": 92, @@ -668,7 +668,7 @@ "type": "rectangle", "pos": { "x": 930, - "y": 425 + "y": 395 }, "width": 173, "height": 92, @@ -721,7 +721,7 @@ "type": "rectangle", "pos": { "x": 2005, - "y": 72 + "y": 479 }, "width": 110, "height": 92, @@ -774,7 +774,7 @@ "type": "rectangle", "pos": { "x": 2155, - "y": 72 + "y": 479 }, "width": 128, "height": 92, @@ -815,7 +815,7 @@ "type": "rectangle", "pos": { "x": 2323, - "y": 72 + "y": 479 }, "width": 72, "height": 92, @@ -856,7 +856,7 @@ "type": "rectangle", "pos": { "x": 2435, - "y": 72 + "y": 479 }, "width": 119, "height": 92, @@ -897,7 +897,7 @@ "type": "rectangle", "pos": { "x": 2594, - "y": 72 + "y": 479 }, "width": 111, "height": 92, @@ -950,7 +950,7 @@ "type": "rectangle", "pos": { "x": 1353, - "y": 209 + "y": 72 }, "width": 103, "height": 92, @@ -1003,7 +1003,7 @@ "type": "rectangle", "pos": { "x": 1496, - "y": 209 + "y": 72 }, "width": 152, "height": 92, @@ -1056,7 +1056,7 @@ "type": "rectangle", "pos": { "x": 1688, - "y": 209 + "y": 72 }, "width": 126, "height": 92, @@ -1109,7 +1109,7 @@ "type": "rectangle", "pos": { "x": 1353, - "y": 341 + "y": 204 }, "width": 138, "height": 92, @@ -1162,7 +1162,7 @@ "type": "rectangle", "pos": { "x": 1531, - "y": 341 + "y": 204 }, "width": 108, "height": 92, @@ -1215,7 +1215,7 @@ "type": "rectangle", "pos": { "x": 1679, - "y": 341 + "y": 204 }, "width": 136, "height": 92, @@ -1291,11 +1291,11 @@ "route": [ { "x": 314, - "y": 426.0329895019531 + "y": 396.2330017089844 }, { "x": 384, - "y": 426.0329895019531 + "y": 396.2330017089844 } ], "animated": false, @@ -1329,11 +1329,11 @@ "route": [ { "x": 620, - "y": 426.0329895019531 + "y": 396.2330017089844 }, { "x": 690, - "y": 426.0329895019531 + "y": 396.2330017089844 } ], "animated": false, @@ -1367,19 +1367,11 @@ "route": [ { "x": 1163, - "y": 335.13299560546875 - }, - { - "x": 1203, - "y": 335.13299560546875 - }, - { - "x": 1203, - "y": 118 + "y": 525 }, { "x": 1945, - "y": 118 + "y": 525 } ], "animated": false, @@ -1413,11 +1405,11 @@ "route": [ { "x": 1163, - "y": 395.7330017089844 + "y": 305.3330078125 }, { "x": 1293, - "y": 395.7330017089844 + "y": 305.3330078125 } ], "animated": false, @@ -1451,19 +1443,11 @@ "route": [ { "x": 1163, - "y": 456.3330078125 - }, - { - "x": 1253, - "y": 456.3330078125 - }, - { - "x": 1253, - "y": 552.3330078125 + "y": 454.6659851074219 }, { "x": 1293, - "y": 552.3330078125 + "y": 454.6659851074219 } ], "animated": false, @@ -1497,19 +1481,11 @@ "route": [ { "x": 1163, - "y": 516.9329833984375 - }, - { - "x": 1203, - "y": 516.9329833984375 - }, - { - "x": 1203, - "y": 591.666015625 + "y": 415.3330078125 }, { "x": 1293, - "y": 591.666015625 + "y": 415.3330078125 } ], "animated": false, diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg index 4ca5b089b8..0dd6352f94 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

-
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - - - - - - - - - - - - - - - - - - - - - - - - - - +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

Identity Native Proxy

+
Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 0ecf3cb1b6..2fccd04275 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "AL", "type": "rectangle", "pos": { - "x": 1581, + "x": 20, "y": 148 }, "width": 64, @@ -48,7 +48,7 @@ "id": "FL", "type": "rectangle", "pos": { - "x": 1573, + "x": 12, "y": 294 }, "width": 80, @@ -89,7 +89,7 @@ "id": "GA", "type": "rectangle", "pos": { - "x": 1573, + "x": 12, "y": 440 }, "width": 80, @@ -130,8 +130,8 @@ "id": "MS", "type": "rectangle", "pos": { - "x": 1125, - "y": 786 + "x": 567, + "y": 636 }, "width": 160, "height": 66, @@ -171,8 +171,8 @@ "id": "TN", "type": "rectangle", "pos": { - "x": 1272, - "y": 2616 + "x": 926, + "y": 3366 }, "width": 280, "height": 66, @@ -212,7 +212,7 @@ "id": "AK", "type": "rectangle", "pos": { - "x": 1263, + "x": 2226, "y": 12 }, "width": 66, @@ -253,8 +253,8 @@ "id": "AZ", "type": "rectangle", "pos": { - "x": 23, - "y": 786 + "x": 872, + "y": 636 }, "width": 65, "height": 66, @@ -294,8 +294,8 @@ "id": "CA", "type": "rectangle", "pos": { - "x": 16, - "y": 1032 + "x": 865, + "y": 932 }, "width": 80, "height": 66, @@ -335,8 +335,8 @@ "id": "NV", "type": "rectangle", "pos": { - "x": 26, - "y": 1528 + "x": 1008, + "y": 1478 }, "width": 160, "height": 66, @@ -376,8 +376,8 @@ "id": "NM", "type": "rectangle", "pos": { - "x": 314, - "y": 1824 + "x": 794, + "y": 2324 }, "width": 120, "height": 66, @@ -417,8 +417,8 @@ "id": "UT", "type": "rectangle", "pos": { - "x": 79, - "y": 2616 + "x": 1226, + "y": 3366 }, "width": 160, "height": 66, @@ -458,7 +458,7 @@ "id": "AR", "type": "rectangle", "pos": { - "x": 1102, + "x": 634, "y": 294 }, "width": 66, @@ -499,7 +499,7 @@ "id": "LA", "type": "rectangle", "pos": { - "x": 1095, + "x": 627, "y": 440 }, "width": 80, @@ -540,8 +540,8 @@ "id": "MO", "type": "rectangle", "pos": { - "x": 619, - "y": 1032 + "x": 1078, + "y": 932 }, "width": 240, "height": 66, @@ -581,8 +581,8 @@ "id": "OK", "type": "rectangle", "pos": { - "x": 312, - "y": 2120 + "x": 913, + "y": 2670 }, "width": 200, "height": 66, @@ -622,8 +622,8 @@ "id": "TX", "type": "rectangle", "pos": { - "x": 593, - "y": 2812 + "x": 488, + "y": 3912 }, "width": 160, "height": 66, @@ -663,8 +663,8 @@ "id": "OR", "type": "rectangle", "pos": { - "x": 30, - "y": 1824 + "x": 1136, + "y": 2324 }, "width": 120, "height": 66, @@ -704,7 +704,7 @@ "id": "CO", "type": "rectangle", "pos": { - "x": 222, + "x": 1002, "y": 440 }, "width": 66, @@ -745,8 +745,8 @@ "id": "KS", "type": "rectangle", "pos": { - "x": 215, - "y": 786 + "x": 995, + "y": 636 }, "width": 80, "height": 66, @@ -786,8 +786,8 @@ "id": "NE", "type": "rectangle", "pos": { - "x": 393, - "y": 1528 + "x": 1188, + "y": 1478 }, "width": 200, "height": 66, @@ -827,8 +827,8 @@ "id": "WY", "type": "rectangle", "pos": { - "x": 114, - "y": 3058 + "x": 1057, + "y": 4608 }, "width": 240, "height": 66, @@ -868,8 +868,8 @@ "id": "CT", "type": "rectangle", "pos": { - "x": 1879, - "y": 1032 + "x": 2062, + "y": 932 }, "width": 64, "height": 66, @@ -909,8 +909,8 @@ "id": "MA", "type": "rectangle", "pos": { - "x": 1871, - "y": 1528 + "x": 2054, + "y": 1478 }, "width": 80, "height": 66, @@ -950,8 +950,8 @@ "id": "NY", "type": "rectangle", "pos": { - "x": 1818, - "y": 2120 + "x": 1585, + "y": 2670 }, "width": 160, "height": 66, @@ -991,8 +991,8 @@ "id": "RI", "type": "rectangle", "pos": { - "x": 1856, - "y": 2812 + "x": 1148, + "y": 3912 }, "width": 120, "height": 66, @@ -1032,8 +1032,8 @@ "id": "DE", "type": "rectangle", "pos": { - "x": 1715, - "y": 1032 + "x": 2162, + "y": 932 }, "width": 63, "height": 66, @@ -1073,8 +1073,8 @@ "id": "MD", "type": "rectangle", "pos": { - "x": 1707, - "y": 1528 + "x": 2154, + "y": 1478 }, "width": 80, "height": 66, @@ -1114,8 +1114,8 @@ "id": "NJ", "type": "rectangle", "pos": { - "x": 1747, - "y": 1824 + "x": 1564, + "y": 2324 }, "width": 80, "height": 66, @@ -1155,8 +1155,8 @@ "id": "PA", "type": "rectangle", "pos": { - "x": 1581, - "y": 2616 + "x": 1749, + "y": 3366 }, "width": 200, "height": 66, @@ -1196,8 +1196,8 @@ "id": "NC", "type": "rectangle", "pos": { - "x": 1586, - "y": 1824 + "x": 1765, + "y": 2324 }, "width": 80, "height": 66, @@ -1237,8 +1237,8 @@ "id": "SC", "type": "rectangle", "pos": { - "x": 1586, - "y": 2120 + "x": 1765, + "y": 2670 }, "width": 80, "height": 66, @@ -1278,7 +1278,7 @@ "id": "HI", "type": "rectangle", "pos": { - "x": 1107, + "x": 2312, "y": 12 }, "width": 59, @@ -1319,8 +1319,8 @@ "id": "ID", "type": "rectangle", "pos": { - "x": 432, - "y": 786 + "x": 1441, + "y": 636 }, "width": 59, "height": 66, @@ -1360,8 +1360,8 @@ "id": "MT", "type": "rectangle", "pos": { - "x": 422, - "y": 1032 + "x": 2245, + "y": 932 }, "width": 80, "height": 66, @@ -1401,8 +1401,8 @@ "id": "WA", "type": "rectangle", "pos": { - "x": 12, - "y": 2812 + "x": 1312, + "y": 3912 }, "width": 80, "height": 66, @@ -1442,7 +1442,7 @@ "id": "IL", "type": "rectangle", "pos": { - "x": 1186, + "x": 2391, "y": 12 }, "width": 57, @@ -1483,7 +1483,7 @@ "id": "IN", "type": "rectangle", "pos": { - "x": 1174, + "x": 2379, "y": 148 }, "width": 80, @@ -1524,7 +1524,7 @@ "id": "IA", "type": "rectangle", "pos": { - "x": 1357, + "x": 2393, "y": 294 }, "width": 80, @@ -1565,7 +1565,7 @@ "id": "MI", "type": "rectangle", "pos": { - "x": 1218, + "x": 2196, "y": 440 }, "width": 120, @@ -1606,8 +1606,8 @@ "id": "KY", "type": "rectangle", "pos": { - "x": 659, - "y": 786 + "x": 1520, + "y": 636 }, "width": 120, "height": 66, @@ -1647,8 +1647,8 @@ "id": "WI", "type": "rectangle", "pos": { - "x": 834, - "y": 2120 + "x": 2167, + "y": 2670 }, "width": 160, "height": 66, @@ -1688,8 +1688,8 @@ "id": "OH", "type": "rectangle", "pos": { - "x": 1398, - "y": 1528 + "x": 2370, + "y": 1478 }, "width": 120, "height": 66, @@ -1729,8 +1729,8 @@ "id": "MN", "type": "rectangle", "pos": { - "x": 1449, - "y": 786 + "x": 2528, + "y": 636 }, "width": 120, "height": 66, @@ -1770,8 +1770,8 @@ "id": "SD", "type": "rectangle", "pos": { - "x": 758, - "y": 1824 + "x": 2314, + "y": 2324 }, "width": 200, "height": 66, @@ -1811,8 +1811,8 @@ "id": "VA", "type": "rectangle", "pos": { - "x": 1376, - "y": 2812 + "x": 1412, + "y": 3912 }, "width": 160, "height": 66, @@ -1852,8 +1852,8 @@ "id": "WV", "type": "rectangle", "pos": { - "x": 1401, - "y": 3058 + "x": 1317, + "y": 4608 }, "width": 200, "height": 66, @@ -1893,8 +1893,8 @@ "id": "ME", "type": "rectangle", "pos": { - "x": 1985, - "y": 1528 + "x": 2510, + "y": 1478 }, "width": 65, "height": 66, @@ -1934,8 +1934,8 @@ "id": "NH", "type": "rectangle", "pos": { - "x": 1965, - "y": 1824 + "x": 2664, + "y": 2324 }, "width": 80, "height": 66, @@ -1975,8 +1975,8 @@ "id": "VT", "type": "rectangle", "pos": { - "x": 1896, - "y": 3058 + "x": 1727, + "y": 4608 }, "width": 120, "height": 66, @@ -2016,8 +2016,8 @@ "id": "ND", "type": "rectangle", "pos": { - "x": 832, - "y": 1528 + "x": 2595, + "y": 1478 }, "width": 120, "height": 66, @@ -2080,11 +2080,11 @@ "labelPercentage": 0, "route": [ { - "x": 1613.4759521484375, + "x": 52, "y": 214 }, { - "x": 1613.4759521484375, + "x": 52, "y": 294 } ], @@ -2118,11 +2118,11 @@ "labelPercentage": 0, "route": [ { - "x": 1600.1419677734375, + "x": 65.33300018310547, "y": 360 }, { - "x": 1600.1419677734375, + "x": 65.33300018310547, "y": 440 } ], @@ -2156,20 +2156,20 @@ "labelPercentage": 0, "route": [ { - "x": 1600.1419677734375, + "x": 65.33300018310547, "y": 506 }, { - "x": 1600.1419677734375, - "y": 696 + "x": 65.33300018310547, + "y": 546 }, { - "x": 1245.3089599609375, - "y": 696 + "x": 607.6069946289062, + "y": 546 }, { - "x": 1245.3089599609375, - "y": 786 + "x": 607.6069946289062, + "y": 636 } ], "animated": false, @@ -2202,20 +2202,28 @@ "labelPercentage": 0, "route": [ { - "x": 1221.3089599609375, - "y": 852 + "x": 631.6069946289062, + "y": 702 + }, + { + "x": 631.6069946289062, + "y": 792 + }, + { + "x": 149.5709991455078, + "y": 792 }, { - "x": 1221.3089599609375, - "y": 2276 + "x": 149.5709991455078, + "y": 3326 }, { - "x": 1377.4759521484375, - "y": 2276 + "x": 961.344970703125, + "y": 3326 }, { - "x": 1377.4759521484375, - "y": 2616 + "x": 961.344970703125, + "y": 3366 } ], "animated": false, @@ -2248,12 +2256,12 @@ "labelPercentage": 0, "route": [ { - "x": 56, - "y": 852 + "x": 905.166015625, + "y": 702 }, { - "x": 56, - "y": 1032 + "x": 905.166015625, + "y": 932 } ], "animated": false, @@ -2286,12 +2294,20 @@ "labelPercentage": 0, "route": [ { - "x": 42.66600036621094, - "y": 1098 + "x": 918.4990234375, + "y": 998 }, { - "x": 42.66600036621094, - "y": 1528 + "x": 918.4990234375, + "y": 1388 + }, + { + "x": 1088.8330078125, + "y": 1388 + }, + { + "x": 1088.8330078125, + "y": 1478 } ], "animated": false, @@ -2324,20 +2340,20 @@ "labelPercentage": 0, "route": [ { - "x": 154.16600036621094, - "y": 1594 + "x": 1040.8330078125, + "y": 1544 }, { - "x": 154.16600036621094, + "x": 1040.8330078125, "y": 1634 }, { - "x": 354.0830078125, + "x": 834.2379760742188, "y": 1634 }, { - "x": 354.0830078125, - "y": 1824 + "x": 834.2379760742188, + "y": 2324 } ], "animated": false, @@ -2370,28 +2386,20 @@ "labelPercentage": 0, "route": [ { - "x": 344.0830078125, - "y": 1890 - }, - { - "x": 344.0830078125, - "y": 1930 - }, - { - "x": 308.5830078125, - "y": 1930 + "x": 824.2379760742188, + "y": 2390 }, { - "x": 308.5830078125, - "y": 2030 + "x": 824.2379760742188, + "y": 3276 }, { - "x": 175.66600036621094, - "y": 2030 + "x": 1258.344970703125, + "y": 3276 }, { - "x": 175.66600036621094, - "y": 2616 + "x": 1258.344970703125, + "y": 3366 } ], "animated": false, @@ -2424,11 +2432,11 @@ "labelPercentage": 0, "route": [ { - "x": 1135.666015625, + "x": 667.6069946289062, "y": 360 }, { - "x": 1135.666015625, + "x": 667.6069946289062, "y": 440 } ], @@ -2462,20 +2470,12 @@ "labelPercentage": 0, "route": [ { - "x": 1122.3330078125, + "x": 687.6069946289062, "y": 506 }, { - "x": 1122.3330078125, - "y": 696 - }, - { - "x": 1165.3089599609375, - "y": 696 - }, - { - "x": 1165.3089599609375, - "y": 786 + "x": 687.6069946289062, + "y": 636 } ], "animated": false, @@ -2508,20 +2508,20 @@ "labelPercentage": 0, "route": [ { - "x": 1157.3089599609375, - "y": 852 + "x": 695.6069946289062, + "y": 702 }, { - "x": 1157.3089599609375, - "y": 892 + "x": 695.6069946289062, + "y": 792 }, { - "x": 779.427978515625, - "y": 892 + "x": 1118.9520263671875, + "y": 792 }, { - "x": 779.427978515625, - "y": 1032 + "x": 1118.9520263671875, + "y": 932 } ], "animated": false, @@ -2554,28 +2554,28 @@ "labelPercentage": 0, "route": [ { - "x": 653.7139892578125, - "y": 1098 + "x": 1113.238037109375, + "y": 998 }, { - "x": 653.7139892578125, - "y": 1188 + "x": 1113.238037109375, + "y": 1038 }, { - "x": 273.0830078125, - "y": 1188 + "x": 603.3800048828125, + "y": 1038 }, { - "x": 273.0830078125, - "y": 1980 + "x": 603.3800048828125, + "y": 2580 }, { - "x": 345.75, - "y": 1980 + "x": 946.4039916992188, + "y": 2580 }, { - "x": 345.75, - "y": 2120 + "x": 946.4039916992188, + "y": 2670 } ], "animated": false, @@ -2608,20 +2608,20 @@ "labelPercentage": 0, "route": [ { - "x": 445.75, - "y": 2186 + "x": 1013.0709838867188, + "y": 2736 }, { - "x": 445.75, - "y": 2376 + "x": 1013.0709838867188, + "y": 2876 }, { - "x": 1307.4759521484375, - "y": 2376 + "x": 996.344970703125, + "y": 2876 }, { - "x": 1307.4759521484375, - "y": 2616 + "x": 996.344970703125, + "y": 3366 } ], "animated": false, @@ -2654,20 +2654,20 @@ "labelPercentage": 0, "route": [ { - "x": 1328.4759521484375, - "y": 2682 + "x": 982.344970703125, + "y": 3432 }, { - "x": 1328.4759521484375, - "y": 2772 + "x": 982.344970703125, + "y": 3472 }, { - "x": 721.416015625, - "y": 2772 + "x": 616.9879760742188, + "y": 3472 }, { - "x": 721.416015625, - "y": 2812 + "x": 616.9879760742188, + "y": 3912 } ], "animated": false, @@ -2700,12 +2700,20 @@ "labelPercentage": 0, "route": [ { - "x": 69.33300018310547, - "y": 1098 + "x": 891.8330078125, + "y": 998 + }, + { + "x": 891.8330078125, + "y": 1438 + }, + { + "x": 1048.8330078125, + "y": 1438 }, { - "x": 69.33300018310547, - "y": 1528 + "x": 1048.8330078125, + "y": 1478 } ], "animated": false, @@ -2738,12 +2746,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.16600036621094, - "y": 1594 + "x": 1136.8330078125, + "y": 1544 }, { - "x": 60.16600036621094, - "y": 1824 + "x": 1136.8330078125, + "y": 1734 + }, + { + "x": 1226.571044921875, + "y": 1734 + }, + { + "x": 1226.571044921875, + "y": 2324 } ], "animated": false, @@ -2776,12 +2792,12 @@ "labelPercentage": 0, "route": [ { - "x": 255.08299255371094, + "x": 1035.6190185546875, "y": 506 }, { - "x": 255.08299255371094, - "y": 786 + "x": 1035.6190185546875, + "y": 636 } ], "animated": false, @@ -2814,20 +2830,20 @@ "labelPercentage": 0, "route": [ { - "x": 241.75, - "y": 852 + "x": 1022.2849731445312, + "y": 702 }, { - "x": 241.75, - "y": 1238 + "x": 1022.2849731445312, + "y": 1338 }, { - "x": 433.3919982910156, - "y": 1238 + "x": 1228.8330078125, + "y": 1338 }, { - "x": 433.3919982910156, - "y": 1528 + "x": 1228.8330078125, + "y": 1478 } ], "animated": false, @@ -2860,20 +2876,20 @@ "labelPercentage": 0, "route": [ { - "x": 426.72601318359375, - "y": 1594 + "x": 1222.166015625, + "y": 1544 }, { - "x": 426.72601318359375, - "y": 1634 + "x": 1222.166015625, + "y": 1684 }, { - "x": 394.0830078125, - "y": 1634 + "x": 874.2379760742188, + "y": 1684 }, { - "x": 394.0830078125, - "y": 1824 + "x": 874.2379760742188, + "y": 2324 } ], "animated": false, @@ -2906,12 +2922,20 @@ "labelPercentage": 0, "route": [ { - "x": 379.0830078125, - "y": 1890 + "x": 884.2379760742188, + "y": 2390 + }, + { + "x": 884.2379760742188, + "y": 2430 + }, + { + "x": 1013.0709838867188, + "y": 2430 }, { - "x": 379.0830078125, - "y": 2120 + "x": 1013.0709838867188, + "y": 2670 } ], "animated": false, @@ -2944,20 +2968,20 @@ "labelPercentage": 0, "route": [ { - "x": 345.75, - "y": 2186 + "x": 1079.738037109375, + "y": 2736 }, { - "x": 345.75, - "y": 2276 + "x": 1079.738037109375, + "y": 2776 }, { - "x": 207.66600036621094, - "y": 2276 + "x": 1290.344970703125, + "y": 2776 }, { - "x": 207.66600036621094, - "y": 2616 + "x": 1290.344970703125, + "y": 3366 } ], "animated": false, @@ -2990,20 +3014,28 @@ "labelPercentage": 0, "route": [ { - "x": 159.66600036621094, - "y": 2682 + "x": 1306.344970703125, + "y": 3432 + }, + { + "x": 1306.344970703125, + "y": 3572 + }, + { + "x": 864.6300048828125, + "y": 3572 }, { - "x": 159.66600036621094, - "y": 2968 + "x": 864.6300048828125, + "y": 4018 }, { - "x": 182.98800659179688, - "y": 2968 + "x": 1126.166015625, + "y": 4018 }, { - "x": 182.98800659179688, - "y": 3058 + "x": 1126.166015625, + "y": 4608 } ], "animated": false, @@ -3036,12 +3068,12 @@ "labelPercentage": 0, "route": [ { - "x": 1911.8089599609375, - "y": 1098 + "x": 2094.3330078125, + "y": 998 }, { - "x": 1911.8089599609375, - "y": 1528 + "x": 2094.3330078125, + "y": 1478 } ], "animated": false, @@ -3074,12 +3106,28 @@ "labelPercentage": 0, "route": [ { - "x": 1898.4759521484375, - "y": 1594 + "x": 2081, + "y": 1544 }, { - "x": 1898.4759521484375, - "y": 2120 + "x": 2081, + "y": 1584 + }, + { + "x": 1523.904052734375, + "y": 1584 + }, + { + "x": 1523.904052734375, + "y": 2480 + }, + { + "x": 1625.404052734375, + "y": 2480 + }, + { + "x": 1625.404052734375, + "y": 2670 } ], "animated": false, @@ -3112,12 +3160,20 @@ "labelPercentage": 0, "route": [ { - "x": 1916.4759521484375, - "y": 2186 + "x": 1649.404052734375, + "y": 2736 + }, + { + "x": 1649.404052734375, + "y": 3672 }, { - "x": 1916.4759521484375, - "y": 2812 + "x": 1208.344970703125, + "y": 3672 + }, + { + "x": 1208.344970703125, + "y": 3912 } ], "animated": false, @@ -3150,12 +3206,12 @@ "labelPercentage": 0, "route": [ { - "x": 1747.3089599609375, - "y": 1098 + "x": 2194.3330078125, + "y": 998 }, { - "x": 1747.3089599609375, - "y": 1528 + "x": 2194.3330078125, + "y": 1478 } ], "animated": false, @@ -3188,12 +3244,20 @@ "labelPercentage": 0, "route": [ { - "x": 1760.6419677734375, - "y": 1594 + "x": 2181, + "y": 1544 + }, + { + "x": 2181, + "y": 1634 }, { - "x": 1760.6419677734375, - "y": 1824 + "x": 1604.904052734375, + "y": 1634 + }, + { + "x": 1604.904052734375, + "y": 2324 } ], "animated": false, @@ -3226,20 +3290,28 @@ "labelPercentage": 0, "route": [ { - "x": 1774.4759521484375, - "y": 1890 + "x": 1591.571044921875, + "y": 2390 }, { - "x": 1774.4759521484375, - "y": 2476 + "x": 1591.571044921875, + "y": 2530 }, { - "x": 1681.25, - "y": 2476 + "x": 1544.404052734375, + "y": 2530 }, { - "x": 1681.25, - "y": 2616 + "x": 1544.404052734375, + "y": 3176 + }, + { + "x": 1782.344970703125, + "y": 3176 + }, + { + "x": 1782.344970703125, + "y": 3366 } ], "animated": false, @@ -3272,11 +3344,11 @@ "labelPercentage": 0, "route": [ { - "x": 1626.8089599609375, + "x": 38.66600036621094, "y": 360 }, { - "x": 1626.8089599609375, + "x": 38.66600036621094, "y": 440 } ], @@ -3310,12 +3382,20 @@ "labelPercentage": 0, "route": [ { - "x": 1626.8089599609375, + "x": 38.66600036621094, "y": 506 }, { - "x": 1626.8089599609375, - "y": 1824 + "x": 38.66600036621094, + "y": 2284 + }, + { + "x": 1805.404052734375, + "y": 2284 + }, + { + "x": 1805.404052734375, + "y": 2324 } ], "animated": false, @@ -3348,12 +3428,12 @@ "labelPercentage": 0, "route": [ { - "x": 1613.4759521484375, - "y": 1890 + "x": 1818.738037109375, + "y": 2390 }, { - "x": 1613.4759521484375, - "y": 2120 + "x": 1818.738037109375, + "y": 2670 } ], "animated": false, @@ -3386,28 +3466,20 @@ "labelPercentage": 0, "route": [ { - "x": 1613.4759521484375, - "y": 2186 - }, - { - "x": 1613.4759521484375, - "y": 2226 - }, - { - "x": 1500.3919677734375, - "y": 2226 + "x": 1818.738037109375, + "y": 2736 }, { - "x": 1500.3919677734375, - "y": 2326 + "x": 1818.738037109375, + "y": 3026 }, { - "x": 1482.4759521484375, - "y": 2326 + "x": 1101.344970703125, + "y": 3026 }, { - "x": 1482.4759521484375, - "y": 2616 + "x": 1101.344970703125, + "y": 3366 } ], "animated": false, @@ -3440,12 +3512,20 @@ "labelPercentage": 0, "route": [ { - "x": 462, - "y": 852 + "x": 1470.8330078125, + "y": 702 }, { - "x": 462, - "y": 1032 + "x": 1470.8330078125, + "y": 892 + }, + { + "x": 2285.8330078125, + "y": 892 + }, + { + "x": 2285.8330078125, + "y": 932 } ], "animated": false, @@ -3478,20 +3558,20 @@ "labelPercentage": 0, "route": [ { - "x": 448.6659851074219, - "y": 1098 + "x": 2272.5, + "y": 998 }, { - "x": 448.6659851074219, - "y": 1138 + "x": 2272.5, + "y": 1388 }, { - "x": 146.16600036621094, - "y": 1138 + "x": 1128.8330078125, + "y": 1388 }, { - "x": 146.16600036621094, - "y": 1528 + "x": 1128.8330078125, + "y": 1478 } ], "animated": false, @@ -3524,12 +3604,20 @@ "labelPercentage": 0, "route": [ { - "x": 90.16600036621094, - "y": 1594 + "x": 1104.8330078125, + "y": 1544 }, { - "x": 90.16600036621094, - "y": 1824 + "x": 1104.8330078125, + "y": 1784 + }, + { + "x": 1196.571044921875, + "y": 1784 + }, + { + "x": 1196.571044921875, + "y": 2324 } ], "animated": false, @@ -3562,12 +3650,28 @@ "labelPercentage": 0, "route": [ { - "x": 90.16600036621094, - "y": 1890 + "x": 1196.571044921875, + "y": 2390 + }, + { + "x": 1196.571044921875, + "y": 2530 + }, + { + "x": 1408.071044921875, + "y": 2530 + }, + { + "x": 1408.071044921875, + "y": 3276 + }, + { + "x": 1354.344970703125, + "y": 3276 }, { - "x": 90.16600036621094, - "y": 2616 + "x": 1354.344970703125, + "y": 3366 } ], "animated": false, @@ -3600,20 +3704,12 @@ "labelPercentage": 0, "route": [ { - "x": 119.66600036621094, - "y": 2682 + "x": 1339.010986328125, + "y": 3432 }, { - "x": 119.66600036621094, - "y": 2722 - }, - { - "x": 65.33300018310547, - "y": 2722 - }, - { - "x": 65.33300018310547, - "y": 2812 + "x": 1339.010986328125, + "y": 3912 } ], "animated": false, @@ -3646,20 +3742,20 @@ "labelPercentage": 0, "route": [ { - "x": 52, - "y": 2878 + "x": 1352.344970703125, + "y": 3978 }, { - "x": 52, - "y": 3018 + "x": 1352.344970703125, + "y": 4068 }, { - "x": 148.70199584960938, - "y": 3018 + "x": 1160.4520263671875, + "y": 4068 }, { - "x": 148.70199584960938, - "y": 3058 + "x": 1160.4520263671875, + "y": 4608 } ], "animated": false, @@ -3692,11 +3788,11 @@ "labelPercentage": 0, "route": [ { - "x": 1214.916015625, + "x": 2419.988037109375, "y": 78 }, { - "x": 1214.916015625, + "x": 2419.988037109375, "y": 148 } ], @@ -3730,19 +3826,11 @@ "labelPercentage": 0, "route": [ { - "x": 1228.25, + "x": 2433.321044921875, "y": 214 }, { - "x": 1228.25, - "y": 254 - }, - { - "x": 1397.8330078125, - "y": 254 - }, - { - "x": 1397.8330078125, + "x": 2433.321044921875, "y": 294 } ], @@ -3776,19 +3864,19 @@ "labelPercentage": 0, "route": [ { - "x": 1384.5, + "x": 2419.988037109375, "y": 360 }, { - "x": 1384.5, + "x": 2419.988037109375, "y": 400 }, { - "x": 1278.166015625, + "x": 2256.654052734375, "y": 400 }, { - "x": 1278.166015625, + "x": 2256.654052734375, "y": 440 } ], @@ -3822,20 +3910,20 @@ "labelPercentage": 0, "route": [ { - "x": 1242.166015625, + "x": 2244.654052734375, "y": 506 }, { - "x": 1242.166015625, + "x": 2244.654052734375, "y": 596 }, { - "x": 719.427978515625, + "x": 1610.3330078125, "y": 596 }, { - "x": 719.427978515625, - "y": 786 + "x": 1610.3330078125, + "y": 636 } ], "animated": false, @@ -3868,12 +3956,20 @@ "labelPercentage": 0, "route": [ { - "x": 699.427978515625, - "y": 852 + "x": 1600.3330078125, + "y": 702 }, { - "x": 699.427978515625, - "y": 1032 + "x": 1600.3330078125, + "y": 792 + }, + { + "x": 1238.9520263671875, + "y": 792 + }, + { + "x": 1238.9520263671875, + "y": 932 } ], "animated": false, @@ -3906,28 +4002,28 @@ "labelPercentage": 0, "route": [ { - "x": 790.8569946289062, - "y": 1098 + "x": 1250.3800048828125, + "y": 998 }, { - "x": 790.8569946289062, - "y": 1488 + "x": 1250.3800048828125, + "y": 1138 }, { - "x": 717.7260131835938, - "y": 1488 + "x": 1896.404052734375, + "y": 1138 }, { - "x": 717.7260131835938, - "y": 2080 + "x": 1896.404052734375, + "y": 2530 }, { - "x": 866.416015625, - "y": 2080 + "x": 2199.821044921875, + "y": 2530 }, { - "x": 866.416015625, - "y": 2120 + "x": 2199.821044921875, + "y": 2670 } ], "animated": false, @@ -3960,20 +4056,20 @@ "labelPercentage": 0, "route": [ { - "x": 1201.5830078125, + "x": 2406.654052734375, "y": 214 }, { - "x": 1201.5830078125, + "x": 2406.654052734375, "y": 254 }, { - "x": 689.427978515625, + "x": 1541.3330078125, "y": 254 }, { - "x": 689.427978515625, - "y": 786 + "x": 1541.3330078125, + "y": 636 } ], "animated": false, @@ -4006,19 +4102,19 @@ "labelPercentage": 0, "route": [ { - "x": 749.427978515625, - "y": 786 + "x": 1580.3330078125, + "y": 636 }, { - "x": 749.427978515625, - "y": 646 + "x": 1580.3330078125, + "y": 546 }, { - "x": 1266.166015625, - "y": 646 + "x": 2220.654052734375, + "y": 546 }, { - "x": 1266.166015625, + "x": 2220.654052734375, "y": 506 } ], @@ -4052,28 +4148,20 @@ "labelPercentage": 0, "route": [ { - "x": 1290.166015625, + "x": 2268.654052734375, "y": 506 }, { - "x": 1290.166015625, - "y": 746 - }, - { - "x": 1408.6419677734375, - "y": 746 - }, - { - "x": 1408.6419677734375, - "y": 1138 + "x": 2268.654052734375, + "y": 596 }, { - "x": 1458.8089599609375, - "y": 1138 + "x": 2430.5830078125, + "y": 596 }, { - "x": 1458.8089599609375, - "y": 1528 + "x": 2430.5830078125, + "y": 1478 } ], "animated": false, @@ -4106,20 +4194,20 @@ "labelPercentage": 0, "route": [ { - "x": 1411.166015625, + "x": 2446.654052734375, "y": 360 }, { - "x": 1411.166015625, + "x": 2446.654052734375, "y": 400 }, { - "x": 1529.6419677734375, + "x": 2608.5830078125, "y": 400 }, { - "x": 1529.6419677734375, - "y": 786 + "x": 2608.5830078125, + "y": 636 } ], "animated": false, @@ -4152,20 +4240,20 @@ "labelPercentage": 0, "route": [ { - "x": 1479.6419677734375, - "y": 852 + "x": 2558.5830078125, + "y": 702 }, { - "x": 1479.6419677734375, - "y": 942 + "x": 2558.5830078125, + "y": 842 }, { - "x": 819.427978515625, - "y": 942 + "x": 1278.9520263671875, + "y": 842 }, { - "x": 819.427978515625, - "y": 1032 + "x": 1278.9520263671875, + "y": 932 } ], "animated": false, @@ -4198,20 +4286,20 @@ "labelPercentage": 0, "route": [ { - "x": 688, - "y": 1098 + "x": 1181.8089599609375, + "y": 998 }, { - "x": 688, - "y": 1338 + "x": 1181.8089599609375, + "y": 1238 }, { - "x": 473.3919982910156, - "y": 1338 + "x": 1308.8330078125, + "y": 1238 }, { - "x": 473.3919982910156, - "y": 1528 + "x": 1308.8330078125, + "y": 1478 } ], "animated": false, @@ -4244,20 +4332,20 @@ "labelPercentage": 0, "route": [ { - "x": 526.7260131835938, - "y": 1594 + "x": 1322.166015625, + "y": 1544 }, { - "x": 526.7260131835938, - "y": 1684 + "x": 1322.166015625, + "y": 2084 }, { - "x": 792.0590209960938, - "y": 1684 + "x": 2348.154052734375, + "y": 2084 }, { - "x": 792.0590209960938, - "y": 1824 + "x": 2348.154052734375, + "y": 2324 } ], "animated": false, @@ -4290,20 +4378,20 @@ "labelPercentage": 0, "route": [ { - "x": 858.7260131835938, - "y": 1890 + "x": 2381.488037109375, + "y": 2390 }, { - "x": 858.7260131835938, - "y": 2030 + "x": 2381.488037109375, + "y": 2530 }, { - "x": 898.416015625, - "y": 2030 + "x": 2295.821044921875, + "y": 2530 }, { - "x": 898.416015625, - "y": 2120 + "x": 2295.821044921875, + "y": 2670 } ], "animated": false, @@ -4336,20 +4424,20 @@ "labelPercentage": 0, "route": [ { - "x": 268.4159851074219, - "y": 852 + "x": 1048.9520263671875, + "y": 702 }, { - "x": 268.4159851074219, - "y": 892 + "x": 1048.9520263671875, + "y": 742 }, { - "x": 659.427978515625, - "y": 892 + "x": 1158.9520263671875, + "y": 742 }, { - "x": 659.427978515625, - "y": 1032 + "x": 1158.9520263671875, + "y": 932 } ], "animated": false, @@ -4382,20 +4470,20 @@ "labelPercentage": 0, "route": [ { - "x": 722.2849731445312, - "y": 1098 + "x": 1216.094970703125, + "y": 998 }, { - "x": 722.2849731445312, - "y": 1388 + "x": 1216.094970703125, + "y": 1188 }, { - "x": 513.3920288085938, - "y": 1388 + "x": 1348.8330078125, + "y": 1188 }, { - "x": 513.3920288085938, - "y": 1528 + "x": 1348.8330078125, + "y": 1478 } ], "animated": false, @@ -4428,28 +4516,28 @@ "labelPercentage": 0, "route": [ { - "x": 460.0589904785156, - "y": 1594 + "x": 1255.4990234375, + "y": 1544 }, { - "x": 460.0589904785156, - "y": 1784 + "x": 1255.4990234375, + "y": 2234 }, { - "x": 494.5589904785156, - "y": 1784 + "x": 1296.571044921875, + "y": 2234 }, { - "x": 494.5589904785156, - "y": 1930 + "x": 1296.571044921875, + "y": 2480 }, { - "x": 445.75, - "y": 1930 + "x": 1046.404052734375, + "y": 2480 }, { - "x": 445.75, - "y": 2120 + "x": 1046.404052734375, + "y": 2670 } ], "animated": false, @@ -4482,12 +4570,20 @@ "labelPercentage": 0, "route": [ { - "x": 739.427978515625, - "y": 852 + "x": 1560.3330078125, + "y": 702 + }, + { + "x": 1560.3330078125, + "y": 742 + }, + { + "x": 1198.9520263671875, + "y": 742 }, { - "x": 739.427978515625, - "y": 1032 + "x": 1198.9520263671875, + "y": 932 } ], "animated": false, @@ -4520,20 +4616,20 @@ "labelPercentage": 0, "route": [ { - "x": 825.1420288085938, - "y": 1098 + "x": 1284.666015625, + "y": 998 }, { - "x": 825.1420288085938, - "y": 1238 + "x": 1284.666015625, + "y": 1088 }, { - "x": 1428.8089599609375, - "y": 1238 + "x": 2400.5830078125, + "y": 1088 }, { - "x": 1428.8089599609375, - "y": 1528 + "x": 2400.5830078125, + "y": 1478 } ], "animated": false, @@ -4566,12 +4662,28 @@ "labelPercentage": 0, "route": [ { - "x": 1458.8089599609375, - "y": 1594 + "x": 2430.5830078125, + "y": 1544 + }, + { + "x": 2430.5830078125, + "y": 1684 + }, + { + "x": 2784.5830078125, + "y": 1684 + }, + { + "x": 2784.5830078125, + "y": 3226 }, { - "x": 1458.8089599609375, - "y": 2616 + "x": 1171.344970703125, + "y": 3226 + }, + { + "x": 1171.344970703125, + "y": 3366 } ], "animated": false, @@ -4604,12 +4716,20 @@ "labelPercentage": 0, "route": [ { - "x": 1408.4759521484375, - "y": 2682 + "x": 1094.344970703125, + "y": 3432 + }, + { + "x": 1094.344970703125, + "y": 3822 + }, + { + "x": 1476.344970703125, + "y": 3822 }, { - "x": 1408.4759521484375, - "y": 2812 + "x": 1476.344970703125, + "y": 3912 } ], "animated": false, @@ -4642,12 +4762,20 @@ "labelPercentage": 0, "route": [ { - "x": 1435.2259521484375, - "y": 2878 + "x": 1492.344970703125, + "y": 3978 + }, + { + "x": 1492.344970703125, + "y": 4218 + }, + { + "x": 1384.260986328125, + "y": 4218 }, { - "x": 1435.2259521484375, - "y": 3058 + "x": 1384.260986328125, + "y": 4608 } ], "animated": false, @@ -4680,20 +4808,12 @@ "labelPercentage": 0, "route": [ { - "x": 1149, + "x": 647.6069946289062, "y": 506 }, { - "x": 1149, - "y": 546 - }, - { - "x": 1205.3089599609375, - "y": 546 - }, - { - "x": 1205.3089599609375, - "y": 786 + "x": 647.6069946289062, + "y": 636 } ], "animated": false, @@ -4726,20 +4846,28 @@ "labelPercentage": 0, "route": [ { - "x": 1189.3089599609375, - "y": 852 + "x": 599.6069946289062, + "y": 702 + }, + { + "x": 599.6069946289062, + "y": 742 }, { - "x": 1189.3089599609375, - "y": 2722 + "x": 97.07099914550781, + "y": 742 }, { - "x": 689.416015625, - "y": 2722 + "x": 97.07099914550781, + "y": 3472 }, { - "x": 689.416015625, - "y": 2812 + "x": 520.9879760742188, + "y": 3472 + }, + { + "x": 520.9879760742188, + "y": 3912 } ], "animated": false, @@ -4772,12 +4900,20 @@ "labelPercentage": 0, "route": [ { - "x": 2018.4759521484375, - "y": 1594 + "x": 2543.0830078125, + "y": 1544 + }, + { + "x": 2543.0830078125, + "y": 1634 + }, + { + "x": 2717.916015625, + "y": 1634 }, { - "x": 2018.4759521484375, - "y": 1824 + "x": 2717.916015625, + "y": 2324 } ], "animated": false, @@ -4810,28 +4946,28 @@ "labelPercentage": 0, "route": [ { - "x": 1733.9759521484375, - "y": 1594 + "x": 2207.666015625, + "y": 1544 }, { - "x": 1733.9759521484375, - "y": 1634 + "x": 2207.666015625, + "y": 1934 }, { - "x": 1706.8089599609375, - "y": 1634 + "x": 2090.738037109375, + "y": 1934 }, { - "x": 1706.8089599609375, - "y": 2426 + "x": 2090.738037109375, + "y": 3276 }, { - "x": 1647.916015625, - "y": 2426 + "x": 1882.344970703125, + "y": 3276 }, { - "x": 1647.916015625, - "y": 2616 + "x": 1882.344970703125, + "y": 3366 } ], "animated": false, @@ -4864,20 +5000,20 @@ "labelPercentage": 0, "route": [ { - "x": 1621.25, - "y": 2682 + "x": 1829.010986328125, + "y": 3432 }, { - "x": 1621.25, - "y": 2772 + "x": 1829.010986328125, + "y": 3822 }, { - "x": 1504.4759521484375, - "y": 2772 + "x": 1540.344970703125, + "y": 3822 }, { - "x": 1504.4759521484375, - "y": 2812 + "x": 1540.344970703125, + "y": 3912 } ], "animated": false, @@ -4910,12 +5046,20 @@ "labelPercentage": 0, "route": [ { - "x": 1468.5589599609375, - "y": 2878 + "x": 1532.344970703125, + "y": 3978 }, { - "x": 1468.5589599609375, - "y": 3058 + "x": 1532.344970703125, + "y": 4318 + }, + { + "x": 1417.594970703125, + "y": 4318 + }, + { + "x": 1417.594970703125, + "y": 4608 } ], "animated": false, @@ -4948,20 +5092,20 @@ "labelPercentage": 0, "route": [ { - "x": 1925.1419677734375, - "y": 1594 + "x": 2107.666015625, + "y": 1544 }, { - "x": 1925.1419677734375, - "y": 1634 + "x": 2107.666015625, + "y": 1884 }, { - "x": 1991.8089599609375, - "y": 1634 + "x": 2691.25, + "y": 1884 }, { - "x": 1991.8089599609375, - "y": 1824 + "x": 2691.25, + "y": 2324 } ], "animated": false, @@ -4994,20 +5138,20 @@ "labelPercentage": 0, "route": [ { - "x": 1991.8089599609375, - "y": 1890 + "x": 2691.25, + "y": 2390 }, { - "x": 1991.8089599609375, - "y": 1930 + "x": 2691.25, + "y": 2480 }, { - "x": 1938.4759521484375, - "y": 1930 + "x": 1705.404052734375, + "y": 2480 }, { - "x": 1938.4759521484375, - "y": 2120 + "x": 1705.404052734375, + "y": 2670 } ], "animated": false, @@ -5040,12 +5184,20 @@ "labelPercentage": 0, "route": [ { - "x": 1947.4759521484375, - "y": 2186 + "x": 1617.404052734375, + "y": 2736 + }, + { + "x": 1617.404052734375, + "y": 3622 + }, + { + "x": 1178.344970703125, + "y": 3622 }, { - "x": 1947.4759521484375, - "y": 2812 + "x": 1178.344970703125, + "y": 3912 } ], "animated": false, @@ -5078,20 +5230,20 @@ "labelPercentage": 0, "route": [ { - "x": 1896.4759521484375, - "y": 2878 + "x": 1228.344970703125, + "y": 3978 }, { - "x": 1896.4759521484375, - "y": 2968 + "x": 1228.344970703125, + "y": 4018 }, { - "x": 1926.4759521484375, - "y": 2968 + "x": 1787.93994140625, + "y": 4018 }, { - "x": 1926.4759521484375, - "y": 3058 + "x": 1787.93994140625, + "y": 4608 } ], "animated": false, @@ -5124,20 +5276,20 @@ "labelPercentage": 0, "route": [ { - "x": 1314.166015625, + "x": 2292.654052734375, "y": 506 }, { - "x": 1314.166015625, + "x": 2292.654052734375, "y": 546 }, { - "x": 1489.6419677734375, + "x": 2568.5830078125, "y": 546 }, { - "x": 1489.6419677734375, - "y": 786 + "x": 2568.5830078125, + "y": 636 } ], "animated": false, @@ -5170,20 +5322,20 @@ "labelPercentage": 0, "route": [ { - "x": 1538.916015625, - "y": 852 + "x": 2588.5830078125, + "y": 702 }, { - "x": 1538.916015625, - "y": 1238 + "x": 2588.5830078125, + "y": 1088 }, { - "x": 1488.8089599609375, - "y": 1238 + "x": 2460.5830078125, + "y": 1088 }, { - "x": 1488.8089599609375, - "y": 1528 + "x": 2460.5830078125, + "y": 1478 } ], "animated": false, @@ -5216,20 +5368,20 @@ "labelPercentage": 0, "route": [ { - "x": 1428.8089599609375, - "y": 1594 + "x": 2400.5830078125, + "y": 1544 }, { - "x": 1428.8089599609375, - "y": 1980 + "x": 2400.5830078125, + "y": 1984 }, { - "x": 962.416015625, - "y": 1980 + "x": 2231.821044921875, + "y": 1984 }, { - "x": 962.416015625, - "y": 2120 + "x": 2231.821044921875, + "y": 2670 } ], "animated": false, @@ -5262,20 +5414,20 @@ "labelPercentage": 0, "route": [ { - "x": 1509.6419677734375, - "y": 852 + "x": 2618.5830078125, + "y": 702 }, { - "x": 1509.6419677734375, - "y": 1188 + "x": 2618.5830078125, + "y": 742 }, { - "x": 912.0590209960938, - "y": 1188 + "x": 2675.5830078125, + "y": 742 }, { - "x": 912.0590209960938, - "y": 1528 + "x": 2675.5830078125, + "y": 1478 } ], "animated": false, @@ -5308,12 +5460,20 @@ "labelPercentage": 0, "route": [ { - "x": 858.7260131835938, - "y": 1594 + "x": 2655.5830078125, + "y": 1544 + }, + { + "x": 2655.5830078125, + "y": 1784 + }, + { + "x": 2448.154052734375, + "y": 1784 }, { - "x": 858.7260131835938, - "y": 1824 + "x": 2448.154052734375, + "y": 2324 } ], "animated": false, @@ -5346,20 +5506,20 @@ "labelPercentage": 0, "route": [ { - "x": 892.0590209960938, - "y": 1890 + "x": 2348.154052734375, + "y": 2390 }, { - "x": 892.0590209960938, - "y": 1980 + "x": 2348.154052734375, + "y": 2430 }, { - "x": 930.416015625, - "y": 1980 + "x": 2263.821044921875, + "y": 2430 }, { - "x": 930.416015625, - "y": 2120 + "x": 2263.821044921875, + "y": 2670 } ], "animated": false, @@ -5392,20 +5552,28 @@ "labelPercentage": 0, "route": [ { - "x": 1253.3089599609375, - "y": 852 + "x": 663.6069946289062, + "y": 702 }, { - "x": 1253.3089599609375, - "y": 2226 + "x": 663.6069946289062, + "y": 2184 }, { - "x": 1412.4759521484375, - "y": 2226 + "x": 1885.404052734375, + "y": 2184 }, { - "x": 1412.4759521484375, - "y": 2616 + "x": 1885.404052734375, + "y": 3126 + }, + { + "x": 1136.344970703125, + "y": 3126 + }, + { + "x": 1136.344970703125, + "y": 3366 } ], "animated": false, @@ -5438,20 +5606,20 @@ "labelPercentage": 0, "route": [ { - "x": 756.5709838867188, - "y": 1098 + "x": 1147.52294921875, + "y": 998 }, { - "x": 756.5709838867188, - "y": 1438 + "x": 1147.52294921875, + "y": 1288 }, { - "x": 553.3920288085938, - "y": 1438 + "x": 1268.8330078125, + "y": 1288 }, { - "x": 553.3920288085938, - "y": 1528 + "x": 1268.8330078125, + "y": 1478 } ], "animated": false, @@ -5484,20 +5652,28 @@ "labelPercentage": 0, "route": [ { - "x": 505.5589904785156, - "y": 1594 + "x": 1288.8330078125, + "y": 1544 + }, + { + "x": 1288.8330078125, + "y": 2134 + }, + { + "x": 1318.738037109375, + "y": 2134 }, { - "x": 505.5589904785156, - "y": 1980 + "x": 1318.738037109375, + "y": 2580 }, { - "x": 479.0830078125, - "y": 1980 + "x": 1079.738037109375, + "y": 2580 }, { - "x": 479.0830078125, - "y": 2120 + "x": 1079.738037109375, + "y": 2670 } ], "animated": false, @@ -5530,20 +5706,20 @@ "labelPercentage": 0, "route": [ { - "x": 479.0830078125, - "y": 2186 + "x": 1046.404052734375, + "y": 2736 }, { - "x": 479.0830078125, - "y": 2326 + "x": 1046.404052734375, + "y": 2926 }, { - "x": 1342.4759521484375, - "y": 2326 + "x": 1031.344970703125, + "y": 2926 }, { - "x": 1342.4759521484375, - "y": 2616 + "x": 1031.344970703125, + "y": 3366 } ], "animated": false, @@ -5576,20 +5752,20 @@ "labelPercentage": 0, "route": [ { - "x": 475.3330078125, - "y": 1098 + "x": 2299.166015625, + "y": 998 }, { - "x": 475.3330078125, - "y": 1288 + "x": 2299.166015625, + "y": 1038 }, { - "x": 872.0590209960938, - "y": 1288 + "x": 2635.5830078125, + "y": 1038 }, { - "x": 872.0590209960938, - "y": 1528 + "x": 2635.5830078125, + "y": 1478 } ], "animated": false, @@ -5622,12 +5798,20 @@ "labelPercentage": 0, "route": [ { - "x": 892.0590209960938, - "y": 1594 + "x": 2685.5830078125, + "y": 1544 }, { - "x": 892.0590209960938, - "y": 1824 + "x": 2685.5830078125, + "y": 1834 + }, + { + "x": 2481.488037109375, + "y": 1834 + }, + { + "x": 2481.488037109375, + "y": 2324 } ], "animated": false, @@ -5660,28 +5844,20 @@ "labelPercentage": 0, "route": [ { - "x": 792.0590209960938, - "y": 1890 - }, - { - "x": 792.0590209960938, - "y": 1930 - }, - { - "x": 552.416015625, - "y": 1930 + "x": 2414.821044921875, + "y": 2390 }, { - "x": 552.416015625, - "y": 2918 + "x": 2414.821044921875, + "y": 4268 }, { - "x": 251.5590057373047, - "y": 2918 + "x": 1194.738037109375, + "y": 4268 }, { - "x": 251.5590057373047, - "y": 3058 + "x": 1194.738037109375, + "y": 4608 } ], "animated": false, @@ -5714,20 +5890,20 @@ "labelPercentage": 0, "route": [ { - "x": 560.0590209960938, - "y": 1594 + "x": 1355.4990234375, + "y": 1544 }, { - "x": 560.0590209960938, - "y": 1634 + "x": 1355.4990234375, + "y": 2034 }, { - "x": 825.3920288085938, - "y": 1634 + "x": 2381.488037109375, + "y": 2034 }, { - "x": 825.3920288085938, - "y": 1824 + "x": 2381.488037109375, + "y": 2324 } ], "animated": false, @@ -5760,28 +5936,20 @@ "labelPercentage": 0, "route": [ { - "x": 825.3920288085938, - "y": 1890 + "x": 2448.6298828125, + "y": 2390 }, { - "x": 825.3920288085938, - "y": 1980 + "x": 2448.6298828125, + "y": 4368 }, { - "x": 793.416015625, - "y": 1980 + "x": 1229.02294921875, + "y": 4368 }, { - "x": 793.416015625, - "y": 2968 - }, - { - "x": 285.8450012207031, - "y": 2968 - }, - { - "x": 285.8450012207031, - "y": 3058 + "x": 1229.02294921875, + "y": 4608 } ], "animated": false, @@ -5814,12 +5982,20 @@ "labelPercentage": 0, "route": [ { - "x": 120.16600036621094, - "y": 1594 + "x": 1072.8330078125, + "y": 1544 }, { - "x": 120.16600036621094, - "y": 1824 + "x": 1072.8330078125, + "y": 2234 + }, + { + "x": 1166.571044921875, + "y": 2234 + }, + { + "x": 1166.571044921875, + "y": 2324 } ], "animated": false, @@ -5852,12 +6028,28 @@ "labelPercentage": 0, "route": [ { - "x": 120.16600036621094, - "y": 1890 + "x": 1166.571044921875, + "y": 2390 + }, + { + "x": 1166.571044921875, + "y": 2630 }, { - "x": 120.16600036621094, - "y": 2616 + "x": 1377.071044921875, + "y": 2630 + }, + { + "x": 1377.071044921875, + "y": 2776 + }, + { + "x": 1322.344970703125, + "y": 2776 + }, + { + "x": 1322.344970703125, + "y": 3366 } ], "animated": false, @@ -5890,20 +6082,20 @@ "labelPercentage": 0, "route": [ { - "x": 2018.4759521484375, - "y": 1890 + "x": 2717.916015625, + "y": 2390 }, { - "x": 2018.4759521484375, - "y": 2918 + "x": 2717.916015625, + "y": 4568 }, { - "x": 1986.4759521484375, - "y": 2918 + "x": 1817.93994140625, + "y": 4568 }, { - "x": 1986.4759521484375, - "y": 3058 + "x": 1817.93994140625, + "y": 4608 } ], "animated": false, @@ -5936,20 +6128,20 @@ "labelPercentage": 0, "route": [ { - "x": 1801.1419677734375, - "y": 1890 + "x": 1618.238037109375, + "y": 2390 }, { - "x": 1801.1419677734375, - "y": 1930 + "x": 1618.238037109375, + "y": 2430 }, { - "x": 1858.4759521484375, - "y": 1930 + "x": 1665.404052734375, + "y": 2430 }, { - "x": 1858.4759521484375, - "y": 2120 + "x": 1665.404052734375, + "y": 2670 } ], "animated": false, @@ -5982,20 +6174,20 @@ "labelPercentage": 0, "route": [ { - "x": 1850.4759521484375, - "y": 2186 + "x": 1681.404052734375, + "y": 2736 }, { - "x": 1850.4759521484375, - "y": 2526 + "x": 1681.404052734375, + "y": 3076 }, { - "x": 1714.5830078125, - "y": 2526 + "x": 1815.677978515625, + "y": 3076 }, { - "x": 1714.5830078125, - "y": 2616 + "x": 1815.677978515625, + "y": 3366 } ], "animated": false, @@ -6028,12 +6220,20 @@ "labelPercentage": 0, "route": [ { - "x": 412.4159851074219, - "y": 1890 + "x": 854.2379760742188, + "y": 2390 + }, + { + "x": 854.2379760742188, + "y": 2480 + }, + { + "x": 979.7379760742188, + "y": 2480 }, { - "x": 412.4159851074219, - "y": 2120 + "x": 979.7379760742188, + "y": 2670 } ], "animated": false, @@ -6066,20 +6266,20 @@ "labelPercentage": 0, "route": [ { - "x": 390.25, - "y": 2186 + "x": 979.7379760742188, + "y": 2736 }, { - "x": 390.25, - "y": 2772 + "x": 979.7379760742188, + "y": 2826 }, { - "x": 625.416015625, - "y": 2772 + "x": 584.9879760742188, + "y": 2826 }, { - "x": 625.416015625, - "y": 2812 + "x": 584.9879760742188, + "y": 3912 } ], "animated": false, @@ -6112,20 +6312,20 @@ "labelPercentage": 0, "route": [ { - "x": 1882.4759521484375, - "y": 2186 + "x": 1713.404052734375, + "y": 2736 }, { - "x": 1882.4759521484375, - "y": 2576 + "x": 1713.404052734375, + "y": 2776 }, { - "x": 1747.916015625, - "y": 2576 + "x": 1849.010986328125, + "y": 2776 }, { - "x": 1747.916015625, - "y": 2616 + "x": 1849.010986328125, + "y": 3366 } ], "animated": false, @@ -6158,20 +6358,20 @@ "labelPercentage": 0, "route": [ { - "x": 1741.25, - "y": 2682 + "x": 1789.010986328125, + "y": 3432 }, { - "x": 1741.25, - "y": 2722 + "x": 1789.010986328125, + "y": 3772 }, { - "x": 1886.4759521484375, - "y": 2722 + "x": 1238.344970703125, + "y": 3772 }, { - "x": 1886.4759521484375, - "y": 2812 + "x": 1238.344970703125, + "y": 3912 } ], "animated": false, @@ -6204,12 +6404,20 @@ "labelPercentage": 0, "route": [ { - "x": 1956.4759521484375, - "y": 2878 + "x": 1188.344970703125, + "y": 3978 + }, + { + "x": 1188.344970703125, + "y": 4168 + }, + { + "x": 1757.93994140625, + "y": 4168 }, { - "x": 1956.4759521484375, - "y": 3058 + "x": 1757.93994140625, + "y": 4608 } ], "animated": false, @@ -6242,12 +6450,12 @@ "labelPercentage": 0, "route": [ { - "x": 1640.1419677734375, - "y": 1890 + "x": 1792.071044921875, + "y": 2390 }, { - "x": 1640.1419677734375, - "y": 2120 + "x": 1792.071044921875, + "y": 2670 } ], "animated": false, @@ -6280,20 +6488,20 @@ "labelPercentage": 0, "route": [ { - "x": 1640.1419677734375, - "y": 2186 + "x": 1792.071044921875, + "y": 2736 }, { - "x": 1640.1419677734375, - "y": 2376 + "x": 1792.071044921875, + "y": 2976 }, { - "x": 1517.4759521484375, - "y": 2376 + "x": 1066.344970703125, + "y": 2976 }, { - "x": 1517.4759521484375, - "y": 2616 + "x": 1066.344970703125, + "y": 3366 } ], "animated": false, @@ -6326,12 +6534,20 @@ "labelPercentage": 0, "route": [ { - "x": 1440.4759521484375, - "y": 2682 + "x": 1150.344970703125, + "y": 3432 }, { - "x": 1440.4759521484375, - "y": 2812 + "x": 1150.344970703125, + "y": 3472 + }, + { + "x": 1508.344970703125, + "y": 3472 + }, + { + "x": 1508.344970703125, + "y": 3912 } ], "animated": false, @@ -6364,12 +6580,20 @@ "labelPercentage": 0, "route": [ { - "x": 925.3920288085938, - "y": 1594 + "x": 2625.5830078125, + "y": 1544 + }, + { + "x": 2625.5830078125, + "y": 1734 + }, + { + "x": 2414.821044921875, + "y": 1734 }, { - "x": 925.3920288085938, - "y": 1824 + "x": 2414.821044921875, + "y": 2324 } ], "animated": false, @@ -6402,20 +6626,28 @@ "labelPercentage": 0, "route": [ { - "x": 1483.3089599609375, - "y": 1594 + "x": 2460.5830078125, + "y": 1544 + }, + { + "x": 2460.5830078125, + "y": 1584 }, { - "x": 1483.3089599609375, - "y": 2276 + "x": 2795.5830078125, + "y": 1584 }, { - "x": 1614.5830078125, - "y": 2276 + "x": 2795.5830078125, + "y": 3326 }, { - "x": 1614.5830078125, - "y": 2616 + "x": 1915.677978515625, + "y": 3326 + }, + { + "x": 1915.677978515625, + "y": 3366 } ], "animated": false, @@ -6448,20 +6680,20 @@ "labelPercentage": 0, "route": [ { - "x": 1664.5830078125, - "y": 2682 + "x": 1869.010986328125, + "y": 3432 }, { - "x": 1664.5830078125, - "y": 2918 + "x": 1869.010986328125, + "y": 4418 }, { - "x": 1535.2259521484375, - "y": 2918 + "x": 1450.927978515625, + "y": 4418 }, { - "x": 1535.2259521484375, - "y": 3058 + "x": 1450.927978515625, + "y": 4608 } ], "animated": false, @@ -6494,20 +6726,20 @@ "labelPercentage": 0, "route": [ { - "x": 412.4159851074219, - "y": 2186 + "x": 946.4039916992188, + "y": 2736 }, { - "x": 412.4159851074219, - "y": 2722 + "x": 946.4039916992188, + "y": 2776 }, { - "x": 657.416015625, - "y": 2722 + "x": 552.9879760742188, + "y": 2776 }, { - "x": 657.416015625, - "y": 2812 + "x": 552.9879760742188, + "y": 3912 } ], "animated": false, @@ -6540,20 +6772,28 @@ "labelPercentage": 0, "route": [ { - "x": 60.16600036621094, - "y": 1890 + "x": 1226.571044921875, + "y": 2390 }, { - "x": 60.16600036621094, - "y": 1930 + "x": 1226.571044921875, + "y": 2430 }, { - "x": 38.66600036621094, - "y": 1930 + "x": 1481.071044921875, + "y": 2430 }, { - "x": 38.66600036621094, - "y": 2812 + "x": 1481.071044921875, + "y": 3722 + }, + { + "x": 1365.677978515625, + "y": 3722 + }, + { + "x": 1365.677978515625, + "y": 3912 } ], "animated": false, @@ -6586,20 +6826,28 @@ "labelPercentage": 0, "route": [ { - "x": 1689.166015625, - "y": 2682 + "x": 1909.010986328125, + "y": 3432 + }, + { + "x": 1909.010986328125, + "y": 3472 + }, + { + "x": 2016.427978515625, + "y": 3472 }, { - "x": 1689.166015625, - "y": 2968 + "x": 2016.427978515625, + "y": 4518 }, { - "x": 1568.5589599609375, - "y": 2968 + "x": 1484.260986328125, + "y": 4518 }, { - "x": 1568.5589599609375, - "y": 3058 + "x": 1484.260986328125, + "y": 4608 } ], "animated": false, @@ -6632,28 +6880,20 @@ "labelPercentage": 0, "route": [ { - "x": 925.3920288085938, - "y": 1890 - }, - { - "x": 925.3920288085938, - "y": 1930 + "x": 2482.43994140625, + "y": 2390 }, { - "x": 1034.416015625, - "y": 1930 + "x": 2482.43994140625, + "y": 4468 }, { - "x": 1034.416015625, - "y": 3018 + "x": 1263.3089599609375, + "y": 4468 }, { - "x": 320.1300048828125, - "y": 3018 - }, - { - "x": 320.1300048828125, - "y": 3058 + "x": 1263.3089599609375, + "y": 4608 } ], "animated": false, @@ -6686,12 +6926,20 @@ "labelPercentage": 0, "route": [ { - "x": 1472.4759521484375, - "y": 2682 + "x": 1038.344970703125, + "y": 3432 }, { - "x": 1472.4759521484375, - "y": 2812 + "x": 1038.344970703125, + "y": 3872 + }, + { + "x": 1444.344970703125, + "y": 3872 + }, + { + "x": 1444.344970703125, + "y": 3912 } ], "animated": false, @@ -6724,20 +6972,28 @@ "labelPercentage": 0, "route": [ { - "x": 185.16600036621094, - "y": 2682 + "x": 1266.344970703125, + "y": 3432 + }, + { + "x": 1266.344970703125, + "y": 3522 + }, + { + "x": 841.9879760742188, + "y": 3522 }, { - "x": 185.16600036621094, - "y": 2918 + "x": 841.9879760742188, + "y": 4068 }, { - "x": 217.2729949951172, - "y": 2918 + "x": 1091.8800048828125, + "y": 4068 }, { - "x": 217.2729949951172, - "y": 3058 + "x": 1091.8800048828125, + "y": 4608 } ], "animated": false, @@ -6770,12 +7026,20 @@ "labelPercentage": 0, "route": [ { - "x": 1501.8919677734375, - "y": 2878 + "x": 1452.344970703125, + "y": 3978 + }, + { + "x": 1452.344970703125, + "y": 4118 + }, + { + "x": 1350.927978515625, + "y": 4118 }, { - "x": 1501.8919677734375, - "y": 3058 + "x": 1350.927978515625, + "y": 4608 } ], "animated": false, diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 1cab86c062..0564a66983 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3046726316 .fill-N1{fill:#0A0F25;} + .d2-3046726316 .fill-N2{fill:#676C7E;} + .d2-3046726316 .fill-N3{fill:#9499AB;} + .d2-3046726316 .fill-N4{fill:#CFD2DD;} + .d2-3046726316 .fill-N5{fill:#DEE1EB;} + .d2-3046726316 .fill-N6{fill:#EEF1F8;} + .d2-3046726316 .fill-N7{fill:#FFFFFF;} + .d2-3046726316 .fill-B1{fill:#0D32B2;} + .d2-3046726316 .fill-B2{fill:#0D32B2;} + .d2-3046726316 .fill-B3{fill:#E3E9FD;} + .d2-3046726316 .fill-B4{fill:#E3E9FD;} + .d2-3046726316 .fill-B5{fill:#EDF0FD;} + .d2-3046726316 .fill-B6{fill:#F7F8FE;} + .d2-3046726316 .fill-AA2{fill:#4A6FF3;} + .d2-3046726316 .fill-AA4{fill:#EDF0FD;} + .d2-3046726316 .fill-AA5{fill:#F7F8FE;} + .d2-3046726316 .fill-AB4{fill:#EDF0FD;} + .d2-3046726316 .fill-AB5{fill:#F7F8FE;} + .d2-3046726316 .stroke-N1{stroke:#0A0F25;} + .d2-3046726316 .stroke-N2{stroke:#676C7E;} + .d2-3046726316 .stroke-N3{stroke:#9499AB;} + .d2-3046726316 .stroke-N4{stroke:#CFD2DD;} + .d2-3046726316 .stroke-N5{stroke:#DEE1EB;} + .d2-3046726316 .stroke-N6{stroke:#EEF1F8;} + .d2-3046726316 .stroke-N7{stroke:#FFFFFF;} + .d2-3046726316 .stroke-B1{stroke:#0D32B2;} + .d2-3046726316 .stroke-B2{stroke:#0D32B2;} + .d2-3046726316 .stroke-B3{stroke:#E3E9FD;} + .d2-3046726316 .stroke-B4{stroke:#E3E9FD;} + .d2-3046726316 .stroke-B5{stroke:#EDF0FD;} + .d2-3046726316 .stroke-B6{stroke:#F7F8FE;} + .d2-3046726316 .stroke-AA2{stroke:#4A6FF3;} + .d2-3046726316 .stroke-AA4{stroke:#EDF0FD;} + .d2-3046726316 .stroke-AA5{stroke:#F7F8FE;} + .d2-3046726316 .stroke-AB4{stroke:#EDF0FD;} + .d2-3046726316 .stroke-AB5{stroke:#F7F8FE;} + .d2-3046726316 .background-color-N1{background-color:#0A0F25;} + .d2-3046726316 .background-color-N2{background-color:#676C7E;} + .d2-3046726316 .background-color-N3{background-color:#9499AB;} + .d2-3046726316 .background-color-N4{background-color:#CFD2DD;} + .d2-3046726316 .background-color-N5{background-color:#DEE1EB;} + .d2-3046726316 .background-color-N6{background-color:#EEF1F8;} + .d2-3046726316 .background-color-N7{background-color:#FFFFFF;} + .d2-3046726316 .background-color-B1{background-color:#0D32B2;} + .d2-3046726316 .background-color-B2{background-color:#0D32B2;} + .d2-3046726316 .background-color-B3{background-color:#E3E9FD;} + .d2-3046726316 .background-color-B4{background-color:#E3E9FD;} + .d2-3046726316 .background-color-B5{background-color:#EDF0FD;} + .d2-3046726316 .background-color-B6{background-color:#F7F8FE;} + .d2-3046726316 .background-color-AA2{background-color:#4A6FF3;} + .d2-3046726316 .background-color-AA4{background-color:#EDF0FD;} + .d2-3046726316 .background-color-AA5{background-color:#F7F8FE;} + .d2-3046726316 .background-color-AB4{background-color:#EDF0FD;} + .d2-3046726316 .background-color-AB5{background-color:#F7F8FE;} + .d2-3046726316 .color-N1{color:#0A0F25;} + .d2-3046726316 .color-N2{color:#676C7E;} + .d2-3046726316 .color-N3{color:#9499AB;} + .d2-3046726316 .color-N4{color:#CFD2DD;} + .d2-3046726316 .color-N5{color:#DEE1EB;} + .d2-3046726316 .color-N6{color:#EEF1F8;} + .d2-3046726316 .color-N7{color:#FFFFFF;} + .d2-3046726316 .color-B1{color:#0D32B2;} + .d2-3046726316 .color-B2{color:#0D32B2;} + .d2-3046726316 .color-B3{color:#E3E9FD;} + .d2-3046726316 .color-B4{color:#E3E9FD;} + .d2-3046726316 .color-B5{color:#EDF0FD;} + .d2-3046726316 .color-B6{color:#F7F8FE;} + .d2-3046726316 .color-AA2{color:#4A6FF3;} + .d2-3046726316 .color-AA4{color:#EDF0FD;} + .d2-3046726316 .color-AA5{color:#F7F8FE;} + .d2-3046726316 .color-AB4{color:#EDF0FD;} + .d2-3046726316 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index 326815084e..4244d6d531 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "network", "type": "rectangle", "pos": { - "x": 320, + "x": 12, "y": 968 }, "width": 546, @@ -48,7 +48,7 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 370, + "x": 62, "y": 1018 }, "width": 246, @@ -89,7 +89,7 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 423, + "x": 115, "y": 1078 }, "width": 130, @@ -130,7 +130,7 @@ "id": "network.cell tower.transmitter", "type": "rectangle", "pos": { - "x": 420, + "x": 112, "y": 1325 }, "width": 146, @@ -171,7 +171,7 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 636, + "x": 328, "y": 1023 }, "width": 180, @@ -212,7 +212,7 @@ "id": "network.online portal.ui", "type": "hexagon", "pos": { - "x": 686, + "x": 378, "y": 1073 }, "width": 80, @@ -253,7 +253,7 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 389, + "x": 80, "y": 1612 }, "width": 209, @@ -294,7 +294,7 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 439, + "x": 130, "y": 1672 }, "width": 99, @@ -335,7 +335,7 @@ "id": "user", "type": "person", "pos": { - "x": 502, + "x": 193, "y": 175 }, "width": 130, @@ -376,7 +376,7 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 633, + "x": 387, "y": 2045 }, "width": 116, @@ -417,7 +417,7 @@ "id": "logs", "type": "page", "pos": { - "x": 650, + "x": 404, "y": 2282 }, "width": 73, @@ -458,7 +458,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 274, + "x": 343, "y": 42 }, "width": 208, @@ -642,7 +642,7 @@ "id": "products", "type": "class", "pos": { - "x": 12, + "x": 571, "y": 12 }, "width": 242, @@ -706,7 +706,7 @@ "id": "markdown", "type": "text", "pos": { - "x": 1125, + "x": 878, "y": 169 }, "width": 97, @@ -746,7 +746,7 @@ "id": "code", "type": "code", "pos": { - "x": 738, + "x": 492, "y": 368 }, "width": 870, @@ -786,7 +786,7 @@ "id": "ex", "type": "text", "pos": { - "x": 971, + "x": 725, "y": 968 }, "width": 404, @@ -849,11 +849,11 @@ "labelPercentage": 0, "route": [ { - "x": 537, + "x": 228, "y": 1144 }, { - "x": 536.666015625, + "x": 228, "y": 1325 } ], @@ -887,11 +887,11 @@ "labelPercentage": 0, "route": [ { - "x": 494, + "x": 185, "y": 1144 }, { - "x": 494, + "x": 185, "y": 1325 } ], @@ -925,11 +925,11 @@ "labelPercentage": 0, "route": [ { - "x": 451, + "x": 142, "y": 1144 }, { - "x": 450.6659851074219, + "x": 142, "y": 1325 } ], @@ -963,11 +963,11 @@ "labelPercentage": 0, "route": [ { - "x": 493.6659851074219, + "x": 185, "y": 1391 }, { - "x": 494, + "x": 185, "y": 1662 } ], @@ -1001,11 +1001,19 @@ "labelPercentage": 0, "route": [ { - "x": 535, + "x": 237, "y": 262 }, { - "x": 535, + "x": 236.66600036621094, + "y": 328 + }, + { + "x": 191.25, + "y": 328 + }, + { + "x": 191.25, "y": 1018 } ], @@ -1039,19 +1047,19 @@ "labelPercentage": 0, "route": [ { - "x": 599, + "x": 280, "y": 262 }, { - "x": 599, + "x": 280, "y": 923 }, { - "x": 713.3330078125, + "x": 404.6659851074219, "y": 923 }, { - "x": 713, + "x": 405, "y": 1073 } ], @@ -1085,27 +1093,27 @@ "labelPercentage": 0, "route": [ { - "x": 711.0830078125, + "x": 464.8330078125, "y": 2045 }, { - "x": 711.0830078125, + "x": 464.8330078125, "y": 2005 }, { - "x": 927.5, + "x": 681.25, "y": 2005 }, { - "x": 927.5, + "x": 681.25, "y": 923 }, { - "x": 740, + "x": 431.3330078125, "y": 923 }, { - "x": 740, + "x": 431, "y": 1073 } ], @@ -1139,11 +1147,11 @@ "labelPercentage": 0, "route": [ { - "x": 691.75, + "x": 445.5, "y": 2111 }, { - "x": 692, + "x": 446, "y": 2272 } ], @@ -1177,19 +1185,19 @@ "labelPercentage": 0, "route": [ { - "x": 439.1659851074219, + "x": 130.5, "y": 1840 }, { - "x": 439.1659851074219, + "x": 130.5, "y": 2005 }, { - "x": 672.416015625, + "x": 426.1659851074219, "y": 2005 }, { - "x": 672.416015625, + "x": 426.1659851074219, "y": 2045 } ], @@ -1223,11 +1231,11 @@ "labelPercentage": 0, "route": [ { - "x": 1173.5, + "x": 927.25, "y": 288 }, { - "x": 1173.5, + "x": 927.25, "y": 368 } ], @@ -1261,11 +1269,11 @@ "labelPercentage": 0, "route": [ { - "x": 1173.5, + "x": 927.25, "y": 883 }, { - "x": 1173.5, + "x": 927.25, "y": 968 } ], diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index 661460079c..a093db2f1b 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
-
package main +
package main import (     "fmt" @@ -885,7 +885,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}package main +}package main import (     "fmt" @@ -908,28 +908,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - - - - - +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/terminal/elk/board.exp.json b/e2etests/testdata/themes/terminal/elk/board.exp.json index bc3e6b6d0d..ab89857e4c 100644 --- a/e2etests/testdata/themes/terminal/elk/board.exp.json +++ b/e2etests/testdata/themes/terminal/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "network", "type": "rectangle", "pos": { - "x": 349, + "x": 12, "y": 968 }, "width": 621, @@ -49,7 +49,7 @@ "id": "network.cell tower", "type": "rectangle", "pos": { - "x": 399, + "x": 62, "y": 1018 }, "width": 271, @@ -91,7 +91,7 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 449, + "x": 112, "y": 1078 }, "width": 161, @@ -132,7 +132,7 @@ "id": "network.cell tower.transmitter", "type": "rectangle", "pos": { - "x": 459, + "x": 121, "y": 1325 }, "width": 151, @@ -173,7 +173,7 @@ "id": "network.online portal", "type": "rectangle", "pos": { - "x": 690, + "x": 353, "y": 1023 }, "width": 230, @@ -215,7 +215,7 @@ "id": "network.online portal.ui", "type": "hexagon", "pos": { - "x": 765, + "x": 428, "y": 1073 }, "width": 80, @@ -256,7 +256,7 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 412, + "x": 74, "y": 1612 }, "width": 245, @@ -298,7 +298,7 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 473, + "x": 136, "y": 1672 }, "width": 112, @@ -339,7 +339,7 @@ "id": "user", "type": "person", "pos": { - "x": 556, + "x": 218, "y": 175 }, "width": 130, @@ -380,7 +380,7 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 678, + "x": 431, "y": 2045 }, "width": 142, @@ -421,7 +421,7 @@ "id": "logs", "type": "page", "pos": { - "x": 703, + "x": 456, "y": 2282 }, "width": 82, @@ -462,7 +462,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 274, + "x": 368, "y": 42 }, "width": 262, @@ -646,7 +646,7 @@ "id": "products", "type": "class", "pos": { - "x": 12, + "x": 650, "y": 12 }, "width": 242, @@ -710,7 +710,7 @@ "id": "markdown", "type": "text", "pos": { - "x": 1217, + "x": 971, "y": 169 }, "width": 128, @@ -750,7 +750,7 @@ "id": "code", "type": "code", "pos": { - "x": 846, + "x": 600, "y": 368 }, "width": 870, @@ -790,7 +790,7 @@ "id": "ex", "type": "text", "pos": { - "x": 1079, + "x": 833, "y": 968 }, "width": 404, @@ -852,11 +852,11 @@ "labelPercentage": 0, "route": [ { - "x": 583, + "x": 246, "y": 1144 }, { - "x": 583.416015625, + "x": 245.75, "y": 1325 } ], @@ -889,11 +889,11 @@ "labelPercentage": 0, "route": [ { - "x": 535, + "x": 197, "y": 1144 }, { - "x": 534.916015625, + "x": 197.25, "y": 1325 } ], @@ -926,11 +926,11 @@ "labelPercentage": 0, "route": [ { - "x": 487, + "x": 149, "y": 1144 }, { - "x": 486.9159851074219, + "x": 149.25, "y": 1325 } ], @@ -963,11 +963,11 @@ "labelPercentage": 0, "route": [ { - "x": 534.916015625, + "x": 197.25, "y": 1391 }, { - "x": 535, + "x": 197, "y": 1662 } ], @@ -1000,11 +1000,19 @@ "labelPercentage": 0, "route": [ { - "x": 580, - "y": 262 + "x": 261.6659851074219, + "y": 288 + }, + { + "x": 261.6659851074219, + "y": 328 + }, + { + "x": 203, + "y": 328 }, { - "x": 580, + "x": 203, "y": 1018 } ], @@ -1037,19 +1045,19 @@ "labelPercentage": 0, "route": [ { - "x": 662, - "y": 262 + "x": 305, + "y": 288 }, { - "x": 662, + "x": 305, "y": 923 }, { - "x": 792.3330078125, + "x": 454.6659851074219, "y": 923 }, { - "x": 792, + "x": 455, "y": 1073 } ], @@ -1082,27 +1090,27 @@ "labelPercentage": 0, "route": [ { - "x": 773.2080078125, + "x": 526.541015625, "y": 2045 }, { - "x": 773.2080078125, + "x": 526.541015625, "y": 2005 }, { - "x": 1025.166015625, + "x": 778.5, "y": 2005 }, { - "x": 1025.166015625, + "x": 778.5, "y": 923 }, { - "x": 819, + "x": 481.3330078125, "y": 923 }, { - "x": 819, + "x": 481, "y": 1073 } ], @@ -1135,11 +1143,11 @@ "labelPercentage": 0, "route": [ { - "x": 749.541015625, + "x": 502.875, "y": 2111 }, { - "x": 750, + "x": 503, "y": 2272 } ], @@ -1172,19 +1180,19 @@ "labelPercentage": 0, "route": [ { - "x": 473.9159851074219, + "x": 136.25, "y": 1840 }, { - "x": 473.9159851074219, + "x": 136.25, "y": 2005 }, { - "x": 725.875, + "x": 479.2080078125, "y": 2005 }, { - "x": 725.875, + "x": 479.2080078125, "y": 2045 } ], @@ -1217,11 +1225,11 @@ "labelPercentage": 0, "route": [ { - "x": 1281.666015625, + "x": 1035, "y": 288 }, { - "x": 1281.666015625, + "x": 1035, "y": 368 } ], @@ -1254,11 +1262,11 @@ "labelPercentage": 0, "route": [ { - "x": 1281.666015625, + "x": 1035, "y": 883 }, { - "x": 1281.666015625, + "x": 1035, "y": 968 } ], diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg index 6917f2c755..34b9d2945d 100644 --- a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access - - - - - - - - - - - - - - - - - + .d2-400974258 .fill-N1{fill:#2E2E2E;} + .d2-400974258 .fill-N2{fill:#2E2E2E;} + .d2-400974258 .fill-N3{fill:#595959;} + .d2-400974258 .fill-N4{fill:#858585;} + .d2-400974258 .fill-N5{fill:#B1B1B1;} + .d2-400974258 .fill-N6{fill:#DCDCDC;} + .d2-400974258 .fill-N7{fill:#DCDCDC;} + .d2-400974258 .fill-B1{fill:#2E7D32;} + .d2-400974258 .fill-B2{fill:#66BB6A;} + .d2-400974258 .fill-B3{fill:#A5D6A7;} + .d2-400974258 .fill-B4{fill:#C5E1A5;} + .d2-400974258 .fill-B5{fill:#E6EE9C;} + .d2-400974258 .fill-B6{fill:#FFF59D;} + .d2-400974258 .fill-AA2{fill:#0D47A1;} + .d2-400974258 .fill-AA4{fill:#42A5F5;} + .d2-400974258 .fill-AA5{fill:#90CAF9;} + .d2-400974258 .fill-AB4{fill:#F44336;} + .d2-400974258 .fill-AB5{fill:#FFCDD2;} + .d2-400974258 .stroke-N1{stroke:#2E2E2E;} + .d2-400974258 .stroke-N2{stroke:#2E2E2E;} + .d2-400974258 .stroke-N3{stroke:#595959;} + .d2-400974258 .stroke-N4{stroke:#858585;} + .d2-400974258 .stroke-N5{stroke:#B1B1B1;} + .d2-400974258 .stroke-N6{stroke:#DCDCDC;} + .d2-400974258 .stroke-N7{stroke:#DCDCDC;} + .d2-400974258 .stroke-B1{stroke:#2E7D32;} + .d2-400974258 .stroke-B2{stroke:#66BB6A;} + .d2-400974258 .stroke-B3{stroke:#A5D6A7;} + .d2-400974258 .stroke-B4{stroke:#C5E1A5;} + .d2-400974258 .stroke-B5{stroke:#E6EE9C;} + .d2-400974258 .stroke-B6{stroke:#FFF59D;} + .d2-400974258 .stroke-AA2{stroke:#0D47A1;} + .d2-400974258 .stroke-AA4{stroke:#42A5F5;} + .d2-400974258 .stroke-AA5{stroke:#90CAF9;} + .d2-400974258 .stroke-AB4{stroke:#F44336;} + .d2-400974258 .stroke-AB5{stroke:#FFCDD2;} + .d2-400974258 .background-color-N1{background-color:#2E2E2E;} + .d2-400974258 .background-color-N2{background-color:#2E2E2E;} + .d2-400974258 .background-color-N3{background-color:#595959;} + .d2-400974258 .background-color-N4{background-color:#858585;} + .d2-400974258 .background-color-N5{background-color:#B1B1B1;} + .d2-400974258 .background-color-N6{background-color:#DCDCDC;} + .d2-400974258 .background-color-N7{background-color:#DCDCDC;} + .d2-400974258 .background-color-B1{background-color:#2E7D32;} + .d2-400974258 .background-color-B2{background-color:#66BB6A;} + .d2-400974258 .background-color-B3{background-color:#A5D6A7;} + .d2-400974258 .background-color-B4{background-color:#C5E1A5;} + .d2-400974258 .background-color-B5{background-color:#E6EE9C;} + .d2-400974258 .background-color-B6{background-color:#FFF59D;} + .d2-400974258 .background-color-AA2{background-color:#0D47A1;} + .d2-400974258 .background-color-AA4{background-color:#42A5F5;} + .d2-400974258 .background-color-AA5{background-color:#90CAF9;} + .d2-400974258 .background-color-AB4{background-color:#F44336;} + .d2-400974258 .background-color-AB5{background-color:#FFCDD2;} + .d2-400974258 .color-N1{color:#2E2E2E;} + .d2-400974258 .color-N2{color:#2E2E2E;} + .d2-400974258 .color-N3{color:#595959;} + .d2-400974258 .color-N4{color:#858585;} + .d2-400974258 .color-N5{color:#B1B1B1;} + .d2-400974258 .color-N6{color:#DCDCDC;} + .d2-400974258 .color-N7{color:#DCDCDC;} + .d2-400974258 .color-B1{color:#2E7D32;} + .d2-400974258 .color-B2{color:#66BB6A;} + .d2-400974258 .color-B3{color:#A5D6A7;} + .d2-400974258 .color-B4{color:#C5E1A5;} + .d2-400974258 .color-B5{color:#E6EE9C;} + .d2-400974258 .color-B6{color:#FFF59D;} + .d2-400974258 .color-AA2{color:#0D47A1;} + .d2-400974258 .color-AA4{color:#42A5F5;} + .d2-400974258 .color-AA5{color:#90CAF9;} + .d2-400974258 .color-AB4{color:#F44336;} + .d2-400974258 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access + + + + + + + + + + + + + + + + + \ No newline at end of file