diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 0bba1d25c..7cf396ffe 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -73,11 +73,10 @@ type ELKEdge struct { } type ELKGraph struct { - ID string `json:"id"` - LayoutOptions *elkOpts `json:"layoutOptions"` - DefaultLayoutOptions *elkOpts `json:"defaultLayoutOptions"` - Children []*ELKNode `json:"children,omitempty"` - Edges []*ELKEdge `json:"edges,omitempty"` + ID string `json:"id"` + LayoutOptions *elkOpts `json:"layoutOptions"` + Children []*ELKNode `json:"children,omitempty"` + Edges []*ELKEdge `json:"edges,omitempty"` } type ConfigurableOpts struct { @@ -99,6 +98,7 @@ var DefaultOpts = ConfigurableOpts{ var port_spacing = 40. type elkOpts struct { + EdgeNode int `json:"elk.spacing.edgeNode,omitempty"` FixedAlignment string `json:"elk.layered.nodePlacement.bk.fixedAlignment,omitempty"` Thoroughness int `json:"elk.layered.thoroughness,omitempty"` EdgeEdgeBetweenLayersSpacing int `json:"elk.layered.spacing.edgeEdgeBetweenLayers,omitempty"` @@ -143,6 +143,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err LayoutOptions: &elkOpts{ Thoroughness: 8, EdgeEdgeBetweenLayersSpacing: 50, + EdgeNode: 40, HierarchyHandling: "INCLUDE_CHILDREN", FixedAlignment: "BALANCED", ConsiderModelOrder: "NODES_AND_EDGES", @@ -223,6 +224,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err EdgeEdgeBetweenLayersSpacing: 50, HierarchyHandling: "INCLUDE_CHILDREN", FixedAlignment: "BALANCED", + EdgeNode: 40, ConsiderModelOrder: "NODES_AND_EDGES", // Why is it (height, width)? I have no clue, but it works. NodeSizeMinimum: fmt.Sprintf("(%d, %d)", int(math.Ceil(height)), int(math.Ceil(width))), @@ -257,6 +259,10 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err paddingTop, ) } + } else { + n.LayoutOptions = &elkOpts{ + // Margins: "[top=100,left=100,bottom=100,right=100]", + } } if obj.LabelWidth != nil && obj.LabelHeight != nil { diff --git a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg index 82141c623..c110ca200 100644 --- a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1972917360 .fill-N1{fill:#0A0F25;} + .d2-1972917360 .fill-N2{fill:#676C7E;} + .d2-1972917360 .fill-N3{fill:#9499AB;} + .d2-1972917360 .fill-N4{fill:#CFD2DD;} + .d2-1972917360 .fill-N5{fill:#DEE1EB;} + .d2-1972917360 .fill-N6{fill:#EEF1F8;} + .d2-1972917360 .fill-N7{fill:#FFFFFF;} + .d2-1972917360 .fill-B1{fill:#0D32B2;} + .d2-1972917360 .fill-B2{fill:#0D32B2;} + .d2-1972917360 .fill-B3{fill:#E3E9FD;} + .d2-1972917360 .fill-B4{fill:#E3E9FD;} + .d2-1972917360 .fill-B5{fill:#EDF0FD;} + .d2-1972917360 .fill-B6{fill:#F7F8FE;} + .d2-1972917360 .fill-AA2{fill:#4A6FF3;} + .d2-1972917360 .fill-AA4{fill:#EDF0FD;} + .d2-1972917360 .fill-AA5{fill:#F7F8FE;} + .d2-1972917360 .fill-AB4{fill:#EDF0FD;} + .d2-1972917360 .fill-AB5{fill:#F7F8FE;} + .d2-1972917360 .stroke-N1{stroke:#0A0F25;} + .d2-1972917360 .stroke-N2{stroke:#676C7E;} + .d2-1972917360 .stroke-N3{stroke:#9499AB;} + .d2-1972917360 .stroke-N4{stroke:#CFD2DD;} + .d2-1972917360 .stroke-N5{stroke:#DEE1EB;} + .d2-1972917360 .stroke-N6{stroke:#EEF1F8;} + .d2-1972917360 .stroke-N7{stroke:#FFFFFF;} + .d2-1972917360 .stroke-B1{stroke:#0D32B2;} + .d2-1972917360 .stroke-B2{stroke:#0D32B2;} + .d2-1972917360 .stroke-B3{stroke:#E3E9FD;} + .d2-1972917360 .stroke-B4{stroke:#E3E9FD;} + .d2-1972917360 .stroke-B5{stroke:#EDF0FD;} + .d2-1972917360 .stroke-B6{stroke:#F7F8FE;} + .d2-1972917360 .stroke-AA2{stroke:#4A6FF3;} + .d2-1972917360 .stroke-AA4{stroke:#EDF0FD;} + .d2-1972917360 .stroke-AA5{stroke:#F7F8FE;} + .d2-1972917360 .stroke-AB4{stroke:#EDF0FD;} + .d2-1972917360 .stroke-AB5{stroke:#F7F8FE;} + .d2-1972917360 .background-color-N1{background-color:#0A0F25;} + .d2-1972917360 .background-color-N2{background-color:#676C7E;} + .d2-1972917360 .background-color-N3{background-color:#9499AB;} + .d2-1972917360 .background-color-N4{background-color:#CFD2DD;} + .d2-1972917360 .background-color-N5{background-color:#DEE1EB;} + .d2-1972917360 .background-color-N6{background-color:#EEF1F8;} + .d2-1972917360 .background-color-N7{background-color:#FFFFFF;} + .d2-1972917360 .background-color-B1{background-color:#0D32B2;} + .d2-1972917360 .background-color-B2{background-color:#0D32B2;} + .d2-1972917360 .background-color-B3{background-color:#E3E9FD;} + .d2-1972917360 .background-color-B4{background-color:#E3E9FD;} + .d2-1972917360 .background-color-B5{background-color:#EDF0FD;} + .d2-1972917360 .background-color-B6{background-color:#F7F8FE;} + .d2-1972917360 .background-color-AA2{background-color:#4A6FF3;} + .d2-1972917360 .background-color-AA4{background-color:#EDF0FD;} + .d2-1972917360 .background-color-AA5{background-color:#F7F8FE;} + .d2-1972917360 .background-color-AB4{background-color:#EDF0FD;} + .d2-1972917360 .background-color-AB5{background-color:#F7F8FE;} + .d2-1972917360 .color-N1{color:#0A0F25;} + .d2-1972917360 .color-N2{color:#676C7E;} + .d2-1972917360 .color-N3{color:#9499AB;} + .d2-1972917360 .color-N4{color:#CFD2DD;} + .d2-1972917360 .color-N5{color:#DEE1EB;} + .d2-1972917360 .color-N6{color:#EEF1F8;} + .d2-1972917360 .color-N7{color:#FFFFFF;} + .d2-1972917360 .color-B1{color:#0D32B2;} + .d2-1972917360 .color-B2{color:#0D32B2;} + .d2-1972917360 .color-B3{color:#E3E9FD;} + .d2-1972917360 .color-B4{color:#E3E9FD;} + .d2-1972917360 .color-B5{color:#EDF0FD;} + .d2-1972917360 .color-B6{color:#F7F8FE;} + .d2-1972917360 .color-AA2{color:#4A6FF3;} + .d2-1972917360 .color-AA4{color:#EDF0FD;} + .d2-1972917360 .color-AA5{color:#F7F8FE;} + .d2-1972917360 .color-AB4{color:#EDF0FD;} + .d2-1972917360 .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}]]> @@ -97,7 +97,7 @@ -abc - +abc + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 5229c90b9..b6adf0671 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index e73eddf16..ad7c9469f 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -10,7 +10,7 @@ "x": 184, "y": 373 }, - "width": 421, + "width": 481, "height": 527, "opacity": 1, "strokeDash": 0, @@ -130,7 +130,7 @@ "id": "a.f", "type": "rectangle", "pos": { - "x": 242, + "x": 257, "y": 679 }, "width": 293, @@ -171,7 +171,7 @@ "id": "a.f.i", "type": "rectangle", "pos": { - "x": 292, + "x": 307, "y": 729 }, "width": 49, @@ -212,7 +212,7 @@ "id": "a.f.g", "type": "rectangle", "pos": { - "x": 361, + "x": 376, "y": 729 }, "width": 54, @@ -253,7 +253,7 @@ "id": "s", "type": "rectangle", "pos": { - "x": 273, + "x": 288, "y": 1401 }, "width": 424, @@ -294,7 +294,7 @@ "id": "s.n", "type": "rectangle", "pos": { - "x": 323, + "x": 338, "y": 1453 }, "width": 151, @@ -417,7 +417,7 @@ "id": "u", "type": "rectangle", "pos": { - "x": 261, + "x": 276, "y": 1040 }, "width": 397, @@ -458,7 +458,7 @@ "id": "u.o", "type": "rectangle", "pos": { - "x": 311, + "x": 326, "y": 1095 }, "width": 54, @@ -499,7 +499,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 269, + "x": 299, "y": 12 }, "width": 252, @@ -540,7 +540,7 @@ "id": "h.m", "type": "rectangle", "pos": { - "x": 319, + "x": 349, "y": 62 }, "width": 152, @@ -581,7 +581,7 @@ "id": "h.m.s", "type": "rectangle", "pos": { - "x": 369, + "x": 399, "y": 112 }, "width": 52, @@ -622,7 +622,7 @@ "id": "a.f.j", "type": "rectangle", "pos": { - "x": 435, + "x": 450, "y": 729 }, "width": 50, @@ -663,7 +663,7 @@ "id": "u.s", "type": "rectangle", "pos": { - "x": 385, + "x": 400, "y": 1095 }, "width": 150, @@ -704,7 +704,7 @@ "id": "u.s.j", "type": "rectangle", "pos": { - "x": 435, + "x": 450, "y": 1145 }, "width": 50, @@ -745,7 +745,7 @@ "id": "u.c", "type": "rectangle", "pos": { - "x": 555, + "x": 570, "y": 1195 }, "width": 53, @@ -786,7 +786,7 @@ "id": "s.z", "type": "rectangle", "pos": { - "x": 494, + "x": 509, "y": 1456 }, "width": 153, @@ -827,7 +827,7 @@ "id": "s.z.c", "type": "rectangle", "pos": { - "x": 544, + "x": 559, "y": 1506 }, "width": 53, @@ -868,7 +868,7 @@ "id": "s.n.f", "type": "rectangle", "pos": { - "x": 373, + "x": 388, "y": 1503 }, "width": 51, @@ -909,7 +909,7 @@ "id": "y", "type": "rectangle", "pos": { - "x": 323, + "x": 338, "y": 1752 }, "width": 151, @@ -950,7 +950,7 @@ "id": "y.r", "type": "rectangle", "pos": { - "x": 373, + "x": 388, "y": 1802 }, "width": 51, @@ -991,7 +991,7 @@ "id": "a.g", "type": "rectangle", "pos": { - "x": 406, + "x": 466, "y": 428 }, "width": 149, @@ -1032,7 +1032,7 @@ "id": "a.g.i", "type": "rectangle", "pos": { - "x": 456, + "x": 516, "y": 478 }, "width": 49, @@ -1106,11 +1106,11 @@ "y": 634 }, { - "x": 316.5, + "x": 331.5, "y": 634 }, { - "x": 316.5, + "x": 331.5, "y": 729 } ], @@ -1146,27 +1146,27 @@ "labelPercentage": 0, "route": [ { - "x": 388, + "x": 403, "y": 795 }, { - "x": 388, + "x": 403, "y": 945 }, { - "x": 250, + "x": 235, "y": 945 }, { - "x": 250, + "x": 235, "y": 1356 }, { - "x": 398.75, + "x": 413.75, "y": 1356 }, { - "x": 398.75, + "x": 413.75, "y": 1453.5 } ], @@ -1210,11 +1210,11 @@ "y": 995 }, { - "x": 338, + "x": 353, "y": 995 }, { - "x": 338, + "x": 353, "y": 1095 } ], @@ -1250,19 +1250,19 @@ "labelPercentage": 0, "route": [ { - "x": 395, + "x": 425, "y": 178 }, { - "x": 395, + "x": 425, "y": 634 }, { - "x": 388, + "x": 403, "y": 634 }, { - "x": 388, + "x": 403, "y": 729 } ], @@ -1298,11 +1298,11 @@ "labelPercentage": 0, "route": [ { - "x": 460, + "x": 475, "y": 795 }, { - "x": 460, + "x": 475, "y": 1145 } ], @@ -1338,19 +1338,19 @@ "labelPercentage": 0, "route": [ { - "x": 581.5, + "x": 596.5, "y": 1261 }, { - "x": 581.5, + "x": 596.5, "y": 1356 }, { - "x": 570.75, + "x": 585.75, "y": 1356 }, { - "x": 570.75, + "x": 585.75, "y": 1506 } ], @@ -1386,11 +1386,11 @@ "labelPercentage": 0, "route": [ { - "x": 398.75, + "x": 413.75, "y": 1619.5 }, { - "x": 398.75, + "x": 413.75, "y": 1802 } ], @@ -1426,27 +1426,27 @@ "labelPercentage": 0, "route": [ { - "x": 398.75, + "x": 413.75, "y": 1868 }, { - "x": 398.75, + "x": 413.75, "y": 1963 }, { - "x": 735.25, + "x": 814.25, "y": 1963 }, { - "x": 735.25, + "x": 814.25, "y": 328 }, { - "x": 480.5, + "x": 540.5, "y": 328 }, { - "x": 480.5, + "x": 540.5, "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 6668cf3f7..1156b4555 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-3494148965 .fill-N1{fill:#0A0F25;} + .d2-3494148965 .fill-N2{fill:#676C7E;} + .d2-3494148965 .fill-N3{fill:#9499AB;} + .d2-3494148965 .fill-N4{fill:#CFD2DD;} + .d2-3494148965 .fill-N5{fill:#DEE1EB;} + .d2-3494148965 .fill-N6{fill:#EEF1F8;} + .d2-3494148965 .fill-N7{fill:#FFFFFF;} + .d2-3494148965 .fill-B1{fill:#0D32B2;} + .d2-3494148965 .fill-B2{fill:#0D32B2;} + .d2-3494148965 .fill-B3{fill:#E3E9FD;} + .d2-3494148965 .fill-B4{fill:#E3E9FD;} + .d2-3494148965 .fill-B5{fill:#EDF0FD;} + .d2-3494148965 .fill-B6{fill:#F7F8FE;} + .d2-3494148965 .fill-AA2{fill:#4A6FF3;} + .d2-3494148965 .fill-AA4{fill:#EDF0FD;} + .d2-3494148965 .fill-AA5{fill:#F7F8FE;} + .d2-3494148965 .fill-AB4{fill:#EDF0FD;} + .d2-3494148965 .fill-AB5{fill:#F7F8FE;} + .d2-3494148965 .stroke-N1{stroke:#0A0F25;} + .d2-3494148965 .stroke-N2{stroke:#676C7E;} + .d2-3494148965 .stroke-N3{stroke:#9499AB;} + .d2-3494148965 .stroke-N4{stroke:#CFD2DD;} + .d2-3494148965 .stroke-N5{stroke:#DEE1EB;} + .d2-3494148965 .stroke-N6{stroke:#EEF1F8;} + .d2-3494148965 .stroke-N7{stroke:#FFFFFF;} + .d2-3494148965 .stroke-B1{stroke:#0D32B2;} + .d2-3494148965 .stroke-B2{stroke:#0D32B2;} + .d2-3494148965 .stroke-B3{stroke:#E3E9FD;} + .d2-3494148965 .stroke-B4{stroke:#E3E9FD;} + .d2-3494148965 .stroke-B5{stroke:#EDF0FD;} + .d2-3494148965 .stroke-B6{stroke:#F7F8FE;} + .d2-3494148965 .stroke-AA2{stroke:#4A6FF3;} + .d2-3494148965 .stroke-AA4{stroke:#EDF0FD;} + .d2-3494148965 .stroke-AA5{stroke:#F7F8FE;} + .d2-3494148965 .stroke-AB4{stroke:#EDF0FD;} + .d2-3494148965 .stroke-AB5{stroke:#F7F8FE;} + .d2-3494148965 .background-color-N1{background-color:#0A0F25;} + .d2-3494148965 .background-color-N2{background-color:#676C7E;} + .d2-3494148965 .background-color-N3{background-color:#9499AB;} + .d2-3494148965 .background-color-N4{background-color:#CFD2DD;} + .d2-3494148965 .background-color-N5{background-color:#DEE1EB;} + .d2-3494148965 .background-color-N6{background-color:#EEF1F8;} + .d2-3494148965 .background-color-N7{background-color:#FFFFFF;} + .d2-3494148965 .background-color-B1{background-color:#0D32B2;} + .d2-3494148965 .background-color-B2{background-color:#0D32B2;} + .d2-3494148965 .background-color-B3{background-color:#E3E9FD;} + .d2-3494148965 .background-color-B4{background-color:#E3E9FD;} + .d2-3494148965 .background-color-B5{background-color:#EDF0FD;} + .d2-3494148965 .background-color-B6{background-color:#F7F8FE;} + .d2-3494148965 .background-color-AA2{background-color:#4A6FF3;} + .d2-3494148965 .background-color-AA4{background-color:#EDF0FD;} + .d2-3494148965 .background-color-AA5{background-color:#F7F8FE;} + .d2-3494148965 .background-color-AB4{background-color:#EDF0FD;} + .d2-3494148965 .background-color-AB5{background-color:#F7F8FE;} + .d2-3494148965 .color-N1{color:#0A0F25;} + .d2-3494148965 .color-N2{color:#676C7E;} + .d2-3494148965 .color-N3{color:#9499AB;} + .d2-3494148965 .color-N4{color:#CFD2DD;} + .d2-3494148965 .color-N5{color:#DEE1EB;} + .d2-3494148965 .color-N6{color:#EEF1F8;} + .d2-3494148965 .color-N7{color:#FFFFFF;} + .d2-3494148965 .color-B1{color:#0D32B2;} + .d2-3494148965 .color-B2{color:#0D32B2;} + .d2-3494148965 .color-B3{color:#E3E9FD;} + .d2-3494148965 .color-B4{color:#E3E9FD;} + .d2-3494148965 .color-B5{color:#EDF0FD;} + .d2-3494148965 .color-B6{color:#F7F8FE;} + .d2-3494148965 .color-AA2{color:#4A6FF3;} + .d2-3494148965 .color-AA4{color:#EDF0FD;} + .d2-3494148965 .color-AA5{color:#F7F8FE;} + .d2-3494148965 .color-AB4{color:#EDF0FD;} + .d2-3494148965 .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/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index 86d6b206b..d7467cf90 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 103, - "y": 108 + "y": 115 }, "width": 135, "height": 120, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 390, - "y": 71 + "y": 74 }, "width": 159, "height": 66, @@ -90,7 +90,7 @@ "type": "rectangle", "pos": { "x": 368, - "y": 163 + "y": 170 }, "width": 204, "height": 66, @@ -134,7 +134,7 @@ "y": 12 }, "width": 940, - "height": 368, + "height": 383, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 746, - "y": 82 + "y": 97 }, "width": 94, "height": 120, @@ -213,7 +213,7 @@ "type": "rectangle", "pos": { "x": 970, - "y": 62 + "y": 61 }, "width": 120, "height": 80, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 1170, - "y": 99 + "y": 129 }, "width": 120, "height": 80, @@ -295,7 +295,7 @@ "type": "rectangle", "pos": { "x": 1420, - "y": 96 + "y": 124 }, "width": 122, "height": 80, @@ -336,7 +336,7 @@ "type": "text", "pos": { "x": 702, - "y": 222 + "y": 237 }, "width": 138, "height": 108, @@ -376,7 +376,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 248 + "y": 255 }, "width": 226, "height": 252, @@ -417,7 +417,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 298 + "y": 305 }, "width": 126, "height": 66, @@ -458,7 +458,7 @@ "type": "rectangle", "pos": { "x": 73, - "y": 384 + "y": 391 }, "width": 103, "height": 66, @@ -565,19 +565,19 @@ "route": [ { "x": 238, - "y": 138.25 + "y": 145.75 }, { "x": 278, - "y": 138.25 + "y": 145.75 }, { "x": 278, - "y": 104.125 + "y": 107.875 }, { "x": 390.5, - "y": 104.125 + "y": 107.875 } ], "animated": false, @@ -613,19 +613,19 @@ "route": [ { "x": 238, - "y": 168.25 + "y": 175.75 }, { "x": 328, - "y": 168.25 + "y": 175.75 }, { "x": 328, - "y": 196.25 + "y": 203.75 }, { "x": 368, - "y": 196.25 + "y": 203.75 } ], "animated": false, @@ -661,27 +661,27 @@ "route": [ { "x": 238, - "y": 198.25 + "y": 205.75 }, { "x": 278, - "y": 198.25 + "y": 205.75 }, { "x": 278, - "y": 263.8125 + "y": 288.1875 }, { "x": 612, - "y": 263.8125 + "y": 288.1875 }, { "x": 612, - "y": 288.375 + "y": 299.625 }, { "x": 652, - "y": 288.375 + "y": 299.625 } ], "animated": false, @@ -717,11 +717,11 @@ "route": [ { "x": 840, - "y": 112.5 + "y": 127.5 }, { "x": 880, - "y": 112.5 + "y": 127.5 }, { "x": 880, @@ -765,19 +765,19 @@ "route": [ { "x": 840, - "y": 142.5 + "y": 157.5 }, { "x": 930, - "y": 142.5 + "y": 157.5 }, { "x": 930, - "y": 153 + "y": 183 }, { "x": 1170, - "y": 153 + "y": 183 } ], "animated": false, @@ -813,27 +813,27 @@ "route": [ { "x": 840, - "y": 172.5 + "y": 187.5 }, { "x": 880, - "y": 172.5 + "y": 187.5 }, { "x": 880, - "y": 189.66666666666666 + "y": 249.66666666666669 }, { "x": 1380, - "y": 189.66666666666666 + "y": 249.66666666666669 }, { "x": 1380, - "y": 156.33333333333334 + "y": 184.66666666666669 }, { "x": 1420, - "y": 156.33333333333334 + "y": 184.66666666666669 } ], "animated": false, @@ -869,19 +869,19 @@ "route": [ { "x": 1090, - "y": 115.33333333333334 + "y": 115.33333333333333 }, { "x": 1130, - "y": 115.33333333333334 + "y": 115.33333333333333 }, { "x": 1130, - "y": 126.33333333333334 + "y": 156.33333333333334 }, { "x": 1170, - "y": 126.33333333333334 + "y": 156.33333333333334 } ], "animated": false, @@ -917,19 +917,19 @@ "route": [ { "x": 1290, - "y": 139.66666666666666 + "y": 169.66666666666669 }, { "x": 1330, - "y": 139.66666666666666 + "y": 169.66666666666669 }, { "x": 1330, - "y": 136.33333333333334 + "y": 164.66666666666669 }, { "x": 1420, - "y": 136.33333333333334 + "y": 164.66666666666669 } ], "animated": false, @@ -965,19 +965,19 @@ "route": [ { "x": 1420, - "y": 116.33333333333334 + "y": 144.66666666666669 }, { - "x": 1380, - "y": 116.33333333333334 + "x": 1330, + "y": 144.66666666666669 }, { - "x": 1380, - "y": 88.66666666666667 + "x": 1330, + "y": 88.66666666666666 }, { "x": 1090, - "y": 88.66666666666667 + "y": 88.66666666666666 } ], "animated": false, @@ -1013,11 +1013,11 @@ "route": [ { "x": 549.5, - "y": 104.125 + "y": 107.875 }, { "x": 652, - "y": 104.125 + "y": 107.875 } ], "animated": false, @@ -1053,11 +1053,11 @@ "route": [ { "x": 572, - "y": 196.25 + "y": 203.75 }, { "x": 652, - "y": 196.25 + "y": 203.75 } ], "animated": false, diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index e0cf2c664..8736efd7b 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    +OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteWorkflow-I (Warehousing, Installation)MasterRegional-1Regional-2Regional-N
    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    InstallationSupport - +
InstallationSupport + \ 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 22226a354..3f02ac582 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": 33, + "x": 63, "y": 12 }, "width": 80, @@ -48,7 +48,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 25, + "x": 55, "y": 494 }, "width": 80, @@ -89,7 +89,7 @@ "id": "c", "type": "document", "pos": { - "x": 63, + "x": 108, "y": 338 }, "width": 80, @@ -130,7 +130,7 @@ "id": "Oval", "type": "oval", "pos": { - "x": 23, + "x": 53, "y": 158 }, "width": 100, @@ -195,11 +195,11 @@ "labelPercentage": 0, "route": [ { - "x": 53, + "x": 83, "y": 78 }, { - "x": 53, + "x": 83, "y": 118 }, { @@ -211,11 +211,11 @@ "y": 454 }, { - "x": 52.5, + "x": 82.5, "y": 454 }, { - "x": 52.5, + "x": 82.5, "y": 494 } ], @@ -251,19 +251,19 @@ "labelPercentage": 0, "route": [ { - "x": 103, + "x": 148, "y": 403 }, { - "x": 103, + "x": 148, "y": 454 }, { - "x": 79.16666666666666, + "x": 109.16666666666667, "y": 454 }, { - "x": 79.16666666666666, + "x": 109.16666666666667, "y": 494 } ], @@ -299,11 +299,11 @@ "labelPercentage": 0, "route": [ { - "x": 73, + "x": 103, "y": 78 }, { - "x": 73, + "x": 103, "y": 158 } ], @@ -339,27 +339,27 @@ "labelPercentage": 0, "route": [ { - "x": 116, + "x": 161, "y": 338 }, { - "x": 116.33333333333334, + "x": 161.33333333333334, "y": 298 }, { - "x": 133, + "x": 193, "y": 298 }, { - "x": 133, + "x": 193, "y": 118 }, { - "x": 93, + "x": 123, "y": 118 }, { - "x": 93, + "x": 123, "y": 78 } ], @@ -395,19 +395,19 @@ "labelPercentage": 0, "route": [ { - "x": 73, + "x": 103, "y": 258 }, { - "x": 73, + "x": 103, "y": 298 }, { - "x": 89.66666666666666, + "x": 134.66666666666669, "y": 298 }, { - "x": 90, + "x": 135, "y": 338 } ], diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index a8e23c149..f51594f93 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-568594280 .fill-N1{fill:#0A0F25;} + .d2-568594280 .fill-N2{fill:#676C7E;} + .d2-568594280 .fill-N3{fill:#9499AB;} + .d2-568594280 .fill-N4{fill:#CFD2DD;} + .d2-568594280 .fill-N5{fill:#DEE1EB;} + .d2-568594280 .fill-N6{fill:#EEF1F8;} + .d2-568594280 .fill-N7{fill:#FFFFFF;} + .d2-568594280 .fill-B1{fill:#0D32B2;} + .d2-568594280 .fill-B2{fill:#0D32B2;} + .d2-568594280 .fill-B3{fill:#E3E9FD;} + .d2-568594280 .fill-B4{fill:#E3E9FD;} + .d2-568594280 .fill-B5{fill:#EDF0FD;} + .d2-568594280 .fill-B6{fill:#F7F8FE;} + .d2-568594280 .fill-AA2{fill:#4A6FF3;} + .d2-568594280 .fill-AA4{fill:#EDF0FD;} + .d2-568594280 .fill-AA5{fill:#F7F8FE;} + .d2-568594280 .fill-AB4{fill:#EDF0FD;} + .d2-568594280 .fill-AB5{fill:#F7F8FE;} + .d2-568594280 .stroke-N1{stroke:#0A0F25;} + .d2-568594280 .stroke-N2{stroke:#676C7E;} + .d2-568594280 .stroke-N3{stroke:#9499AB;} + .d2-568594280 .stroke-N4{stroke:#CFD2DD;} + .d2-568594280 .stroke-N5{stroke:#DEE1EB;} + .d2-568594280 .stroke-N6{stroke:#EEF1F8;} + .d2-568594280 .stroke-N7{stroke:#FFFFFF;} + .d2-568594280 .stroke-B1{stroke:#0D32B2;} + .d2-568594280 .stroke-B2{stroke:#0D32B2;} + .d2-568594280 .stroke-B3{stroke:#E3E9FD;} + .d2-568594280 .stroke-B4{stroke:#E3E9FD;} + .d2-568594280 .stroke-B5{stroke:#EDF0FD;} + .d2-568594280 .stroke-B6{stroke:#F7F8FE;} + .d2-568594280 .stroke-AA2{stroke:#4A6FF3;} + .d2-568594280 .stroke-AA4{stroke:#EDF0FD;} + .d2-568594280 .stroke-AA5{stroke:#F7F8FE;} + .d2-568594280 .stroke-AB4{stroke:#EDF0FD;} + .d2-568594280 .stroke-AB5{stroke:#F7F8FE;} + .d2-568594280 .background-color-N1{background-color:#0A0F25;} + .d2-568594280 .background-color-N2{background-color:#676C7E;} + .d2-568594280 .background-color-N3{background-color:#9499AB;} + .d2-568594280 .background-color-N4{background-color:#CFD2DD;} + .d2-568594280 .background-color-N5{background-color:#DEE1EB;} + .d2-568594280 .background-color-N6{background-color:#EEF1F8;} + .d2-568594280 .background-color-N7{background-color:#FFFFFF;} + .d2-568594280 .background-color-B1{background-color:#0D32B2;} + .d2-568594280 .background-color-B2{background-color:#0D32B2;} + .d2-568594280 .background-color-B3{background-color:#E3E9FD;} + .d2-568594280 .background-color-B4{background-color:#E3E9FD;} + .d2-568594280 .background-color-B5{background-color:#EDF0FD;} + .d2-568594280 .background-color-B6{background-color:#F7F8FE;} + .d2-568594280 .background-color-AA2{background-color:#4A6FF3;} + .d2-568594280 .background-color-AA4{background-color:#EDF0FD;} + .d2-568594280 .background-color-AA5{background-color:#F7F8FE;} + .d2-568594280 .background-color-AB4{background-color:#EDF0FD;} + .d2-568594280 .background-color-AB5{background-color:#F7F8FE;} + .d2-568594280 .color-N1{color:#0A0F25;} + .d2-568594280 .color-N2{color:#676C7E;} + .d2-568594280 .color-N3{color:#9499AB;} + .d2-568594280 .color-N4{color:#CFD2DD;} + .d2-568594280 .color-N5{color:#DEE1EB;} + .d2-568594280 .color-N6{color:#EEF1F8;} + .d2-568594280 .color-N7{color:#FFFFFF;} + .d2-568594280 .color-B1{color:#0D32B2;} + .d2-568594280 .color-B2{color:#0D32B2;} + .d2-568594280 .color-B3{color:#E3E9FD;} + .d2-568594280 .color-B4{color:#E3E9FD;} + .d2-568594280 .color-B5{color:#EDF0FD;} + .d2-568594280 .color-B6{color:#F7F8FE;} + .d2-568594280 .color-AA2{color:#4A6FF3;} + .d2-568594280 .color-AA4{color:#EDF0FD;} + .d2-568594280 .color-AA5{color:#F7F8FE;} + .d2-568594280 .color-AB4{color:#EDF0FD;} + .d2-568594280 .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/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 64fccc507..8dce06233 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -10,8 +10,8 @@ "x": 12, "y": 12 }, - "width": 618, - "height": 1862, + "width": 701, + "height": 1812, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -49,9 +49,9 @@ "type": "rectangle", "pos": { "x": 62, - "y": 662 + "y": 612 }, - "width": 472, + "width": 525, "height": 1067, "opacity": 1, "strokeDash": 0, @@ -89,10 +89,10 @@ "id": "aa.bb.cc", "type": "rectangle", "pos": { - "x": 180, - "y": 989 + "x": 203, + "y": 939 }, - "width": 304, + "width": 334, "height": 690, "opacity": 1, "strokeDash": 0, @@ -130,8 +130,8 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 230, - "y": 1039 + "x": 253, + "y": 989 }, "width": 193, "height": 166, @@ -171,8 +171,8 @@ "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 280, - "y": 1134 + "x": 303, + "y": 1084 }, "width": 16, "height": 21, @@ -211,8 +211,8 @@ "id": "aa.bb.cc.dd.ff", "type": "rectangle", "pos": { - "x": 316, - "y": 1089 + "x": 339, + "y": 1039 }, "width": 57, "height": 66, @@ -252,8 +252,8 @@ "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 321, - "y": 1381 + "x": 358, + "y": 1331 }, "width": 80, "height": 21, @@ -292,8 +292,8 @@ "id": "aa.bb.cc.hh", "type": "rectangle", "pos": { - "x": 329, - "y": 1563 + "x": 367, + "y": 1513 }, "width": 63, "height": 66, @@ -334,7 +334,7 @@ "type": "package", "pos": { "x": 112, - "y": 712 + "y": 662 }, "width": 150, "height": 192, @@ -375,7 +375,7 @@ "type": "diamond", "pos": { "x": 162, - "y": 762 + "y": 712 }, "width": 50, "height": 92, @@ -415,8 +415,8 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 282, - "y": 771 + "x": 285, + "y": 721 }, "width": 74, "height": 74, @@ -456,7 +456,7 @@ "id": "aa.ll", "type": "rectangle", "pos": { - "x": 401, + "x": 459, "y": 310 }, "width": 120, @@ -497,7 +497,7 @@ "id": "aa.mm", "type": "cylinder", "pos": { - "x": 265, + "x": 287, "y": 62 }, "width": 160, @@ -538,7 +538,7 @@ "id": "aa.nn", "type": "text", "pos": { - "x": 445, + "x": 467, "y": 110 }, "width": 16, @@ -578,7 +578,7 @@ "id": "aa.oo", "type": "rectangle", "pos": { - "x": 481, + "x": 503, "y": 88 }, "width": 63, @@ -644,20 +644,20 @@ "labelPercentage": 0, "route": [ { - "x": 288.5, - "y": 1155 + "x": 311, + "y": 1105 }, { - "x": 288.5, - "y": 1341 + "x": 311, + "y": 1291 }, { - "x": 347.66666666666663, - "y": 1341 + "x": 385.16666666666663, + "y": 1291 }, { - "x": 347.66666666666663, - "y": 1381 + "x": 385.16666666666663, + "y": 1331 } ], "animated": false, @@ -692,12 +692,12 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 1402 + "x": 398.5, + "y": 1352 }, { - "x": 361, - "y": 1563 + "x": 398.5, + "y": 1513 } ], "animated": false, @@ -733,19 +733,19 @@ "route": [ { "x": 212, - "y": 904 + "y": 854 }, { "x": 212, - "y": 944 + "y": 894 }, { - "x": 298.5, - "y": 944 + "x": 321, + "y": 894 }, { - "x": 298.5, - "y": 1039 + "x": 321, + "y": 989 } ], "animated": false, @@ -780,28 +780,28 @@ "labelPercentage": 0, "route": [ { - "x": 425, + "x": 483.25, "y": 376 }, { - "x": 425, + "x": 483.25, "y": 416 }, { - "x": 395.5, + "x": 443.75, "y": 416 }, { - "x": 395.5, - "y": 617 + "x": 443.75, + "y": 567 }, { - "x": 376, - "y": 617 + "x": 413.5, + "y": 567 }, { - "x": 376, - "y": 662 + "x": 413.5, + "y": 612 } ], "animated": false, @@ -836,20 +836,20 @@ "labelPercentage": 0, "route": [ { - "x": 361, + "x": 384, "y": 180 }, { - "x": 361.25, + "x": 383.75, "y": 567 }, { - "x": 366, + "x": 403.5, "y": 567 }, { - "x": 366, - "y": 989 + "x": 403.5, + "y": 939 } ], "animated": false, @@ -884,19 +884,19 @@ "labelPercentage": 0, "route": [ { - "x": 393, + "x": 416, "y": 176 }, { - "x": 393.25, + "x": 415.75, "y": 220 }, { - "x": 461, + "x": 519.25, "y": 220 }, { - "x": 461, + "x": 519.25, "y": 310 } ], @@ -932,20 +932,20 @@ "labelPercentage": 0, "route": [ { - "x": 329, + "x": 352, "y": 180 }, { - "x": 329.25, + "x": 351.75, "y": 270 }, { - "x": 276.5, + "x": 295.25, "y": 270 }, { - "x": 276.5, - "y": 662 + "x": 295.25, + "y": 612 } ], "animated": false, @@ -980,36 +980,36 @@ "labelPercentage": 0, "route": [ { - "x": 449, + "x": 507.25, "y": 376 }, { - "x": 449, + "x": 507.25, "y": 466 }, { - "x": 438.25, + "x": 494.25, "y": 466 }, { - "x": 438.25, + "x": 494.25, "y": 567 }, { - "x": 433.5, + "x": 486, "y": 567 }, { - "x": 433.5, - "y": 1341 + "x": 486, + "y": 1291 }, { - "x": 374.3333333333333, - "y": 1341 + "x": 411.8333333333333, + "y": 1291 }, { - "x": 374.3333333333333, - "y": 1381 + "x": 411.8333333333333, + "y": 1331 } ], "animated": false, @@ -1044,19 +1044,19 @@ "labelPercentage": 0, "route": [ { - "x": 297, + "x": 320, "y": 176 }, { - "x": 297.25, + "x": 319.75, "y": 220 }, { - "x": 202.5, + "x": 221.25, "y": 220 }, { - "x": 202.5, + "x": 221.25, "y": 567 }, { @@ -1065,7 +1065,7 @@ }, { "x": 187, - "y": 712 + "y": 662 } ], "animated": false, @@ -1100,27 +1100,27 @@ "labelPercentage": 0, "route": [ { - "x": 305.3333333333333, - "y": 1679 + "x": 342.8333333333333, + "y": 1629 }, { - "x": 305.3333333333333, - "y": 1774 + "x": 342.8333333333333, + "y": 1724 }, { - "x": 544.5, - "y": 1774 + "x": 627, + "y": 1724 }, { - "x": 544.5, + "x": 627, "y": 466 }, { - "x": 473, + "x": 531.25, "y": 466 }, { - "x": 473, + "x": 531.25, "y": 376 } ], @@ -1157,26 +1157,26 @@ "route": [ { "x": 162, - "y": 904 + "y": 854 }, { "x": 162, - "y": 1824 + "y": 1774 }, { - "x": 571.5, - "y": 1824 + "x": 654, + "y": 1774 }, { - "x": 571.5, + "x": 654, "y": 416 }, { - "x": 497, + "x": 555.25, "y": 416 }, { - "x": 497, + "x": 555.25, "y": 376 } ], diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 59a0d90fe..c3ff5dc94 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index eec971d40..734441d20 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 98, + "x": 94, "y": 12 }, "width": 53, @@ -48,7 +48,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 48, + "x": 44, "y": 213 }, "width": 226, @@ -89,7 +89,7 @@ "id": "g.b", "type": "rectangle", "pos": { - "x": 98, + "x": 94, "y": 263 }, "width": 53, @@ -253,7 +253,7 @@ "id": "g.e", "type": "rectangle", "pos": { - "x": 171, + "x": 167, "y": 263 }, "width": 53, @@ -360,11 +360,11 @@ "labelPercentage": 0, "route": [ { - "x": 125.25, + "x": 120.75, "y": 78 }, { - "x": 125.25, + "x": 120.75, "y": 263 } ], @@ -400,11 +400,11 @@ "labelPercentage": 0, "route": [ { - "x": 125.25, + "x": 120.75, "y": 329 }, { - "x": 125.25, + "x": 120.75, "y": 474 }, { @@ -456,19 +456,19 @@ "y": 830 }, { - "x": 346, + "x": 376, "y": 830 }, { - "x": 346, + "x": 376, "y": 118 }, { - "x": 198.25, + "x": 193.75, "y": 118 }, { - "x": 198.25, + "x": 193.75, "y": 263 } ], @@ -504,11 +504,11 @@ "labelPercentage": 0, "route": [ { - "x": 198.25, + "x": 193.75, "y": 329 }, { - "x": 198.25, + "x": 193.75, "y": 424 }, { @@ -560,11 +560,11 @@ "y": 168 }, { - "x": 208.25, + "x": 203.75, "y": 168 }, { - "x": 208.25, + "x": 203.75, "y": 213 } ], @@ -600,11 +600,11 @@ "labelPercentage": 0, "route": [ { - "x": 161.75, + "x": 157.25, "y": 379 }, { - "x": 161.75, + "x": 157.25, "y": 424 }, { diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 32d0cec0e..c1be090d9 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec - + .d2-4156255752 .fill-N1{fill:#0A0F25;} + .d2-4156255752 .fill-N2{fill:#676C7E;} + .d2-4156255752 .fill-N3{fill:#9499AB;} + .d2-4156255752 .fill-N4{fill:#CFD2DD;} + .d2-4156255752 .fill-N5{fill:#DEE1EB;} + .d2-4156255752 .fill-N6{fill:#EEF1F8;} + .d2-4156255752 .fill-N7{fill:#FFFFFF;} + .d2-4156255752 .fill-B1{fill:#0D32B2;} + .d2-4156255752 .fill-B2{fill:#0D32B2;} + .d2-4156255752 .fill-B3{fill:#E3E9FD;} + .d2-4156255752 .fill-B4{fill:#E3E9FD;} + .d2-4156255752 .fill-B5{fill:#EDF0FD;} + .d2-4156255752 .fill-B6{fill:#F7F8FE;} + .d2-4156255752 .fill-AA2{fill:#4A6FF3;} + .d2-4156255752 .fill-AA4{fill:#EDF0FD;} + .d2-4156255752 .fill-AA5{fill:#F7F8FE;} + .d2-4156255752 .fill-AB4{fill:#EDF0FD;} + .d2-4156255752 .fill-AB5{fill:#F7F8FE;} + .d2-4156255752 .stroke-N1{stroke:#0A0F25;} + .d2-4156255752 .stroke-N2{stroke:#676C7E;} + .d2-4156255752 .stroke-N3{stroke:#9499AB;} + .d2-4156255752 .stroke-N4{stroke:#CFD2DD;} + .d2-4156255752 .stroke-N5{stroke:#DEE1EB;} + .d2-4156255752 .stroke-N6{stroke:#EEF1F8;} + .d2-4156255752 .stroke-N7{stroke:#FFFFFF;} + .d2-4156255752 .stroke-B1{stroke:#0D32B2;} + .d2-4156255752 .stroke-B2{stroke:#0D32B2;} + .d2-4156255752 .stroke-B3{stroke:#E3E9FD;} + .d2-4156255752 .stroke-B4{stroke:#E3E9FD;} + .d2-4156255752 .stroke-B5{stroke:#EDF0FD;} + .d2-4156255752 .stroke-B6{stroke:#F7F8FE;} + .d2-4156255752 .stroke-AA2{stroke:#4A6FF3;} + .d2-4156255752 .stroke-AA4{stroke:#EDF0FD;} + .d2-4156255752 .stroke-AA5{stroke:#F7F8FE;} + .d2-4156255752 .stroke-AB4{stroke:#EDF0FD;} + .d2-4156255752 .stroke-AB5{stroke:#F7F8FE;} + .d2-4156255752 .background-color-N1{background-color:#0A0F25;} + .d2-4156255752 .background-color-N2{background-color:#676C7E;} + .d2-4156255752 .background-color-N3{background-color:#9499AB;} + .d2-4156255752 .background-color-N4{background-color:#CFD2DD;} + .d2-4156255752 .background-color-N5{background-color:#DEE1EB;} + .d2-4156255752 .background-color-N6{background-color:#EEF1F8;} + .d2-4156255752 .background-color-N7{background-color:#FFFFFF;} + .d2-4156255752 .background-color-B1{background-color:#0D32B2;} + .d2-4156255752 .background-color-B2{background-color:#0D32B2;} + .d2-4156255752 .background-color-B3{background-color:#E3E9FD;} + .d2-4156255752 .background-color-B4{background-color:#E3E9FD;} + .d2-4156255752 .background-color-B5{background-color:#EDF0FD;} + .d2-4156255752 .background-color-B6{background-color:#F7F8FE;} + .d2-4156255752 .background-color-AA2{background-color:#4A6FF3;} + .d2-4156255752 .background-color-AA4{background-color:#EDF0FD;} + .d2-4156255752 .background-color-AA5{background-color:#F7F8FE;} + .d2-4156255752 .background-color-AB4{background-color:#EDF0FD;} + .d2-4156255752 .background-color-AB5{background-color:#F7F8FE;} + .d2-4156255752 .color-N1{color:#0A0F25;} + .d2-4156255752 .color-N2{color:#676C7E;} + .d2-4156255752 .color-N3{color:#9499AB;} + .d2-4156255752 .color-N4{color:#CFD2DD;} + .d2-4156255752 .color-N5{color:#DEE1EB;} + .d2-4156255752 .color-N6{color:#EEF1F8;} + .d2-4156255752 .color-N7{color:#FFFFFF;} + .d2-4156255752 .color-B1{color:#0D32B2;} + .d2-4156255752 .color-B2{color:#0D32B2;} + .d2-4156255752 .color-B3{color:#E3E9FD;} + .d2-4156255752 .color-B4{color:#E3E9FD;} + .d2-4156255752 .color-B5{color:#EDF0FD;} + .d2-4156255752 .color-B6{color:#F7F8FE;} + .d2-4156255752 .color-AA2{color:#4A6FF3;} + .d2-4156255752 .color-AA4{color:#EDF0FD;} + .d2-4156255752 .color-AA5{color:#F7F8FE;} + .d2-4156255752 .color-AB4{color:#EDF0FD;} + .d2-4156255752 .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}]]>agdfbhec + \ 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 219e4afd0..7999c5f00 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": 127, - "y": 208 + "x": 155, + "y": 158 }, "width": 53, "height": 66, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 12, - "y": 354 + "x": 40, + "y": 304 }, "width": 280, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 54, - "y": 208 + "x": 82, + "y": 158 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 317, - "y": 550 + "x": 362, + "y": 500 }, "width": 120, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 321, - "y": 1042 + "x": 384, + "y": 942 }, "width": 120, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 105, - "y": 746 + "x": 139, + "y": 696 }, "width": 80, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 142, - "y": 550 + "x": 187, + "y": 500 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 63, - "y": 550 + "x": 53, + "y": 500 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 87, - "y": 1188 + "x": 79, + "y": 1088 }, "width": 80, "height": 66, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 111, + "x": 141, "y": 12 }, "width": 80, @@ -417,8 +417,8 @@ "id": "k", "type": "rectangle", "pos": { - "x": 101, - "y": 1324 + "x": 92, + "y": 1224 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 466, - "y": 746 + "x": 511, + "y": 696 }, "width": 120, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 216, - "y": 550 + "x": 261, + "y": 500 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 161, - "y": 1042 + "x": 197, + "y": 942 }, "width": 120, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 457, - "y": 550 + "x": 502, + "y": 500 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 531, - "y": 550 + "x": 576, + "y": 500 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 354, - "y": 1188 + "x": 417, + "y": 1088 }, "width": 54, "height": 66, @@ -729,20 +729,20 @@ "labelPercentage": 0, "route": [ { - "x": 153.5, - "y": 274 + "x": 181.5, + "y": 224 }, { - "x": 153.5, - "y": 314 + "x": 181.5, + "y": 264 }, { - "x": 152, - "y": 314 + "x": 180, + "y": 264 }, { - "x": 152, - "y": 354 + "x": 180, + "y": 304 } ], "animated": false, @@ -777,20 +777,20 @@ "labelPercentage": 0, "route": [ { - "x": 80.5, - "y": 274 + "x": 108.5, + "y": 224 }, { - "x": 80.5, - "y": 314 + "x": 108.5, + "y": 264 }, { - "x": 82, - "y": 314 + "x": 110, + "y": 264 }, { - "x": 82, - "y": 354 + "x": 110, + "y": 304 } ], "animated": false, @@ -825,28 +825,28 @@ "labelPercentage": 0, "route": [ { - "x": 377.83333333333337, - "y": 616 + "x": 422.75, + "y": 566 }, { - "x": 377.83333333333337, - "y": 656 + "x": 422.75, + "y": 606 }, { - "x": 376.08333333333337, - "y": 656 + "x": 421, + "y": 606 }, { - "x": 376.08333333333337, - "y": 852 + "x": 421, + "y": 802 }, { - "x": 381.33333333333337, - "y": 852 + "x": 444.3333333333333, + "y": 802 }, { - "x": 381.33333333333337, - "y": 1042 + "x": 444.3333333333333, + "y": 942 } ], "animated": false, @@ -881,20 +881,20 @@ "labelPercentage": 0, "route": [ { - "x": 158.66666666666666, - "y": 812 + "x": 192.66666666666657, + "y": 762 }, { - "x": 158.66666666666666, - "y": 952 + "x": 192.66666666666657, + "y": 852 }, { - "x": 351.33333333333337, - "y": 952 + "x": 414.3333333333333, + "y": 852 }, { - "x": 351.33333333333337, - "y": 1042 + "x": 414.3333333333333, + "y": 942 } ], "animated": false, @@ -929,28 +929,28 @@ "labelPercentage": 0, "route": [ { - "x": 132, - "y": 420 + "x": 160, + "y": 370 }, { - "x": 132, - "y": 460 + "x": 160, + "y": 410 }, { - "x": 131.08333333333334, - "y": 460 + "x": 146, + "y": 410 }, { - "x": 131.08333333333334, - "y": 656 + "x": 146, + "y": 606 }, { - "x": 131.99999999999997, - "y": 656 + "x": 165.99999999999994, + "y": 606 }, { - "x": 131.99999999999997, - "y": 746 + "x": 165.99999999999994, + "y": 696 } ], "animated": false, @@ -985,20 +985,20 @@ "labelPercentage": 0, "route": [ { - "x": 172, - "y": 420 + "x": 200, + "y": 370 }, { - "x": 172, - "y": 460 + "x": 200, + "y": 410 }, { - "x": 169.08333333333334, - "y": 460 + "x": 214, + "y": 410 }, { - "x": 169.08333333333334, - "y": 550 + "x": 214, + "y": 500 } ], "animated": false, @@ -1033,20 +1033,20 @@ "labelPercentage": 0, "route": [ { - "x": 169.08333333333334, - "y": 616 + "x": 214, + "y": 566 }, { - "x": 169.08333333333334, - "y": 656 + "x": 214, + "y": 606 }, { - "x": 158.66666666666666, - "y": 656 + "x": 192.66666666666657, + "y": 606 }, { - "x": 158.66666666666666, - "y": 746 + "x": 192.66666666666657, + "y": 696 } ], "animated": false, @@ -1081,20 +1081,20 @@ "labelPercentage": 0, "route": [ { - "x": 92, - "y": 420 + "x": 120, + "y": 370 }, { - "x": 92, + "x": 120, "y": 460 }, { - "x": 90.08333333333331, + "x": 79.5, "y": 460 }, { - "x": 90.08333333333331, - "y": 550 + "x": 79.5, + "y": 500 } ], "animated": false, @@ -1129,28 +1129,28 @@ "labelPercentage": 0, "route": [ { - "x": 52, - "y": 420 + "x": 80, + "y": 370 }, { - "x": 52, - "y": 460 + "x": 80, + "y": 410 }, { - "x": 51.333333333333314, - "y": 460 + "x": 12, + "y": 410 }, { - "x": 51.333333333333314, - "y": 1148 + "x": 12, + "y": 1048 }, { - "x": 114.49999999999997, - "y": 1148 + "x": 106.08333333333331, + "y": 1048 }, { - "x": 114.49999999999997, - "y": 1188 + "x": 106.08333333333331, + "y": 1088 } ], "animated": false, @@ -1185,20 +1185,20 @@ "labelPercentage": 0, "route": [ { - "x": 212, - "y": 420 + "x": 240, + "y": 370 }, { - "x": 212, - "y": 510 + "x": 240, + "y": 460 }, { - "x": 377.83333333333337, - "y": 510 + "x": 422.75, + "y": 460 }, { - "x": 377.83333333333337, - "y": 550 + "x": 422.75, + "y": 500 } ], "animated": false, @@ -1233,20 +1233,20 @@ "labelPercentage": 0, "route": [ { - "x": 131.58333333333334, + "x": 161.5, "y": 78 }, { - "x": 131.58333333333334, + "x": 161.5, "y": 118 }, { - "x": 80.5, + "x": 108.5, "y": 118 }, { - "x": 80.5, - "y": 208 + "x": 108.5, + "y": 158 } ], "animated": false, @@ -1281,20 +1281,12 @@ "labelPercentage": 0, "route": [ { - "x": 151.58333333333334, + "x": 181.5, "y": 78 }, { - "x": 151.58333333333334, - "y": 168 - }, - { - "x": 153.5, - "y": 168 - }, - { - "x": 153.5, - "y": 208 + "x": 181.5, + "y": 158 } ], "animated": false, @@ -1329,27 +1321,19 @@ "labelPercentage": 0, "route": [ { - "x": 222, - "y": 354 + "x": 250, + "y": 304 }, { - "x": 222, - "y": 314 - }, - { - "x": 220.08333333333334, - "y": 314 - }, - { - "x": 220.08333333333334, + "x": 249.99999999999997, "y": 118 }, { - "x": 171.58333333333334, + "x": 201.5, "y": 118 }, { - "x": 171.58333333333334, + "x": 201.5, "y": 78 } ], @@ -1385,12 +1369,12 @@ "labelPercentage": 0, "route": [ { - "x": 127.83333333333331, - "y": 1254 + "x": 119.41666666666663, + "y": 1154 }, { - "x": 127.83333333333331, - "y": 1324 + "x": 119.41666666666663, + "y": 1224 } ], "animated": false, @@ -1425,20 +1409,20 @@ "labelPercentage": 0, "route": [ { - "x": 407.83333333333337, - "y": 616 + "x": 452.75, + "y": 566 }, { - "x": 407.83333333333337, - "y": 656 + "x": 452.75, + "y": 606 }, { - "x": 526.5833333333334, - "y": 656 + "x": 571.5, + "y": 606 }, { - "x": 526.5833333333334, - "y": 746 + "x": 571.5, + "y": 696 } ], "animated": false, @@ -1473,20 +1457,20 @@ "labelPercentage": 0, "route": [ { - "x": 526.5833333333334, - "y": 812 + "x": 571.5, + "y": 762 }, { - "x": 526.5833333333334, - "y": 852 + "x": 571.5, + "y": 802 }, { - "x": 411.33333333333337, - "y": 852 + "x": 474.3333333333333, + "y": 802 }, { - "x": 411.33333333333337, - "y": 1042 + "x": 474.3333333333333, + "y": 942 } ], "animated": false, @@ -1521,20 +1505,20 @@ "labelPercentage": 0, "route": [ { - "x": 269.4166666666667, - "y": 616 + "x": 314.3333333333333, + "y": 566 }, { - "x": 269.4166666666667, - "y": 706 + "x": 314.3333333333333, + "y": 656 }, { - "x": 496.58333333333337, - "y": 706 + "x": 541.5, + "y": 656 }, { - "x": 496.58333333333337, - "y": 746 + "x": 541.5, + "y": 696 } ], "animated": false, @@ -1569,20 +1553,20 @@ "labelPercentage": 0, "route": [ { - "x": 242.75, - "y": 616 + "x": 287.66666666666663, + "y": 566 }, { - "x": 242.75, - "y": 852 + "x": 287.66666666666663, + "y": 802 }, { - "x": 221.66666666666669, - "y": 852 + "x": 257.25, + "y": 802 }, { - "x": 221.66666666666669, - "y": 1042 + "x": 257.25, + "y": 942 } ], "animated": false, @@ -1617,20 +1601,20 @@ "labelPercentage": 0, "route": [ { - "x": 221.66666666666669, - "y": 1108 + "x": 257.25, + "y": 1008 }, { - "x": 221.66666666666669, - "y": 1148 + "x": 257.25, + "y": 1048 }, { - "x": 141.16666666666666, - "y": 1148 + "x": 132.74999999999994, + "y": 1048 }, { - "x": 141.16666666666666, - "y": 1188 + "x": 132.74999999999994, + "y": 1088 } ], "animated": false, @@ -1665,28 +1649,28 @@ "labelPercentage": 0, "route": [ { - "x": 347.83333333333337, - "y": 616 + "x": 392.75, + "y": 566 }, { - "x": 347.83333333333337, - "y": 656 + "x": 392.75, + "y": 606 }, { - "x": 335.9166666666667, - "y": 656 + "x": 353.41666666666663, + "y": 606 }, { - "x": 335.9166666666667, + "x": 353.41666666666663, "y": 902 }, { - "x": 251.66666666666669, + "x": 287.25, "y": 902 }, { - "x": 251.66666666666669, - "y": 1042 + "x": 287.25, + "y": 942 } ], "animated": false, @@ -1721,20 +1705,20 @@ "labelPercentage": 0, "route": [ { - "x": 131.99999999999997, - "y": 812 + "x": 165.99999999999994, + "y": 762 }, { - "x": 131.99999999999997, - "y": 1002 + "x": 165.99999999999994, + "y": 902 }, { - "x": 191.66666666666669, - "y": 1002 + "x": 227.25, + "y": 902 }, { - "x": 191.66666666666669, - "y": 1042 + "x": 227.25, + "y": 942 } ], "animated": false, @@ -1769,20 +1753,20 @@ "labelPercentage": 0, "route": [ { - "x": 252, - "y": 420 + "x": 280, + "y": 370 }, { - "x": 252, - "y": 460 + "x": 280, + "y": 410 }, { - "x": 484.83333333333337, - "y": 460 + "x": 529.75, + "y": 410 }, { - "x": 484.83333333333337, - "y": 550 + "x": 529.75, + "y": 500 } ], "animated": false, @@ -1817,20 +1801,20 @@ "labelPercentage": 0, "route": [ { - "x": 558.3333333333334, - "y": 616 + "x": 603.25, + "y": 566 }, { - "x": 558.3333333333334, - "y": 656 + "x": 603.25, + "y": 606 }, { - "x": 556.5833333333334, - "y": 656 + "x": 601.5, + "y": 606 }, { - "x": 556.5833333333334, - "y": 746 + "x": 601.5, + "y": 696 } ], "animated": false, @@ -1865,12 +1849,12 @@ "labelPercentage": 0, "route": [ { - "x": 381.33333333333337, - "y": 1108 + "x": 444.3333333333333, + "y": 1008 }, { - "x": 381.33333333333337, - "y": 1188 + "x": 444.3333333333333, + "y": 1088 } ], "animated": false, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index f7f09c5a0..36412a1a3 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-2875301911 .fill-N1{fill:#0A0F25;} + .d2-2875301911 .fill-N2{fill:#676C7E;} + .d2-2875301911 .fill-N3{fill:#9499AB;} + .d2-2875301911 .fill-N4{fill:#CFD2DD;} + .d2-2875301911 .fill-N5{fill:#DEE1EB;} + .d2-2875301911 .fill-N6{fill:#EEF1F8;} + .d2-2875301911 .fill-N7{fill:#FFFFFF;} + .d2-2875301911 .fill-B1{fill:#0D32B2;} + .d2-2875301911 .fill-B2{fill:#0D32B2;} + .d2-2875301911 .fill-B3{fill:#E3E9FD;} + .d2-2875301911 .fill-B4{fill:#E3E9FD;} + .d2-2875301911 .fill-B5{fill:#EDF0FD;} + .d2-2875301911 .fill-B6{fill:#F7F8FE;} + .d2-2875301911 .fill-AA2{fill:#4A6FF3;} + .d2-2875301911 .fill-AA4{fill:#EDF0FD;} + .d2-2875301911 .fill-AA5{fill:#F7F8FE;} + .d2-2875301911 .fill-AB4{fill:#EDF0FD;} + .d2-2875301911 .fill-AB5{fill:#F7F8FE;} + .d2-2875301911 .stroke-N1{stroke:#0A0F25;} + .d2-2875301911 .stroke-N2{stroke:#676C7E;} + .d2-2875301911 .stroke-N3{stroke:#9499AB;} + .d2-2875301911 .stroke-N4{stroke:#CFD2DD;} + .d2-2875301911 .stroke-N5{stroke:#DEE1EB;} + .d2-2875301911 .stroke-N6{stroke:#EEF1F8;} + .d2-2875301911 .stroke-N7{stroke:#FFFFFF;} + .d2-2875301911 .stroke-B1{stroke:#0D32B2;} + .d2-2875301911 .stroke-B2{stroke:#0D32B2;} + .d2-2875301911 .stroke-B3{stroke:#E3E9FD;} + .d2-2875301911 .stroke-B4{stroke:#E3E9FD;} + .d2-2875301911 .stroke-B5{stroke:#EDF0FD;} + .d2-2875301911 .stroke-B6{stroke:#F7F8FE;} + .d2-2875301911 .stroke-AA2{stroke:#4A6FF3;} + .d2-2875301911 .stroke-AA4{stroke:#EDF0FD;} + .d2-2875301911 .stroke-AA5{stroke:#F7F8FE;} + .d2-2875301911 .stroke-AB4{stroke:#EDF0FD;} + .d2-2875301911 .stroke-AB5{stroke:#F7F8FE;} + .d2-2875301911 .background-color-N1{background-color:#0A0F25;} + .d2-2875301911 .background-color-N2{background-color:#676C7E;} + .d2-2875301911 .background-color-N3{background-color:#9499AB;} + .d2-2875301911 .background-color-N4{background-color:#CFD2DD;} + .d2-2875301911 .background-color-N5{background-color:#DEE1EB;} + .d2-2875301911 .background-color-N6{background-color:#EEF1F8;} + .d2-2875301911 .background-color-N7{background-color:#FFFFFF;} + .d2-2875301911 .background-color-B1{background-color:#0D32B2;} + .d2-2875301911 .background-color-B2{background-color:#0D32B2;} + .d2-2875301911 .background-color-B3{background-color:#E3E9FD;} + .d2-2875301911 .background-color-B4{background-color:#E3E9FD;} + .d2-2875301911 .background-color-B5{background-color:#EDF0FD;} + .d2-2875301911 .background-color-B6{background-color:#F7F8FE;} + .d2-2875301911 .background-color-AA2{background-color:#4A6FF3;} + .d2-2875301911 .background-color-AA4{background-color:#EDF0FD;} + .d2-2875301911 .background-color-AA5{background-color:#F7F8FE;} + .d2-2875301911 .background-color-AB4{background-color:#EDF0FD;} + .d2-2875301911 .background-color-AB5{background-color:#F7F8FE;} + .d2-2875301911 .color-N1{color:#0A0F25;} + .d2-2875301911 .color-N2{color:#676C7E;} + .d2-2875301911 .color-N3{color:#9499AB;} + .d2-2875301911 .color-N4{color:#CFD2DD;} + .d2-2875301911 .color-N5{color:#DEE1EB;} + .d2-2875301911 .color-N6{color:#EEF1F8;} + .d2-2875301911 .color-N7{color:#FFFFFF;} + .d2-2875301911 .color-B1{color:#0D32B2;} + .d2-2875301911 .color-B2{color:#0D32B2;} + .d2-2875301911 .color-B3{color:#E3E9FD;} + .d2-2875301911 .color-B4{color:#E3E9FD;} + .d2-2875301911 .color-B5{color:#EDF0FD;} + .d2-2875301911 .color-B6{color:#F7F8FE;} + .d2-2875301911 .color-AA2{color:#4A6FF3;} + .d2-2875301911 .color-AA4{color:#EDF0FD;} + .d2-2875301911 .color-AA5{color:#F7F8FE;} + .d2-2875301911 .color-AB4{color:#EDF0FD;} + .d2-2875301911 .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/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 8f633ddcc..0889b4bf4 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": 183, + "x": 195, "y": 12 }, "width": 102, @@ -48,7 +48,7 @@ "id": "bb", "type": "step", "pos": { - "x": 234, + "x": 245, "y": 193 }, "width": 103, @@ -212,7 +212,7 @@ "id": "ff", "type": "rectangle", "pos": { - "x": 250, + "x": 273, "y": 1889 }, "width": 281, @@ -253,7 +253,7 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 300, + "x": 323, "y": 1939 }, "width": 80, @@ -458,7 +458,7 @@ "id": "ll", "type": "rectangle", "pos": { - "x": 214, + "x": 251, "y": 2468 }, "width": 265, @@ -499,7 +499,7 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 264, + "x": 301, "y": 2518 }, "width": 81, @@ -540,7 +540,7 @@ "id": "ff.mm", "type": "oval", "pos": { - "x": 400, + "x": 423, "y": 1944 }, "width": 81, @@ -581,8 +581,8 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 59, - "y": 3519 + "x": 79, + "y": 3469 }, "width": 327, "height": 166, @@ -622,8 +622,8 @@ "id": "nn.oo", "type": "rectangle", "pos": { - "x": 109, - "y": 3569 + "x": 129, + "y": 3519 }, "width": 63, "height": 66, @@ -663,7 +663,7 @@ "id": "ff.pp", "type": "rectangle", "pos": { - "x": 364, + "x": 402, "y": 2161 }, "width": 63, @@ -704,7 +704,7 @@ "id": "ll.qq", "type": "rectangle", "pos": { - "x": 365, + "x": 402, "y": 2525 }, "width": 64, @@ -745,7 +745,7 @@ "id": "ll.rr", "type": "rectangle", "pos": { - "x": 368, + "x": 405, "y": 2669 }, "width": 58, @@ -1044,8 +1044,8 @@ "id": "nn.xx", "type": "rectangle", "pos": { - "x": 193, - "y": 3569 + "x": 212, + "y": 3519 }, "width": 62, "height": 66, @@ -1085,8 +1085,8 @@ "id": "yy", "type": "rectangle", "pos": { - "x": 284, - "y": 3025 + "x": 309, + "y": 2975 }, "width": 238, "height": 354, @@ -1126,8 +1126,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 334, - "y": 3075 + "x": 359, + "y": 3025 }, "width": 138, "height": 118, @@ -1179,8 +1179,8 @@ "id": "yy.ab", "type": "rectangle", "pos": { - "x": 371, - "y": 3263 + "x": 397, + "y": 3213 }, "width": 63, "height": 66, @@ -1220,8 +1220,8 @@ "id": "nn.ac", "type": "rectangle", "pos": { - "x": 275, - "y": 3569 + "x": 294, + "y": 3519 }, "width": 62, "height": 66, @@ -1261,8 +1261,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 248, - "y": 3760 + "x": 267, + "y": 3710 }, "width": 115, "height": 66, @@ -1327,19 +1327,19 @@ "labelPercentage": 0, "route": [ { - "x": 251, - "y": 112 + "x": 263, + "y": 111 }, { - "x": 251.5, + "x": 263.08333333333337, "y": 153 }, { - "x": 285.5833333333333, + "x": 297.16666666666663, "y": 153 }, { - "x": 286, + "x": 297, "y": 193 } ], @@ -1375,15 +1375,15 @@ "labelPercentage": 0, "route": [ { - "x": 268, + "x": 280, "y": 294 }, { - "x": 268.4166666666667, + "x": 280, "y": 334 }, { - "x": 235.66666666666666, + "x": 235.66666666666669, "y": 334 }, { @@ -1423,15 +1423,15 @@ "labelPercentage": 0, "route": [ { - "x": 217, + "x": 229, "y": 113 }, { - "x": 217.5, + "x": 229.08333333333334, "y": 153 }, { - "x": 150.66666666666666, + "x": 150.66666666666669, "y": 153 }, { @@ -1471,20 +1471,20 @@ "labelPercentage": 0, "route": [ { - "x": 303, - "y": 293 + "x": 314, + "y": 294 }, { - "x": 302.75, + "x": 314.33333333333337, "y": 334 }, { - "x": 353.3333333333333, + "x": 376.5, "y": 334 }, { - "x": 353, - "y": 1954 + "x": 377, + "y": 1955 } ], "animated": false, @@ -1563,11 +1563,11 @@ "y": 783 }, { - "x": 150.66666666666666, + "x": 150.66666666666669, "y": 873 }, { - "x": 198.16666666666666, + "x": 198.16666666666669, "y": 873 }, { @@ -1695,27 +1695,27 @@ "labelPercentage": 0, "route": [ { - "x": 248.33333333333331, + "x": 248.33333333333334, "y": 1567.6666666666667 }, { - "x": 248.33333333333331, + "x": 248.33333333333334, "y": 1646 }, { - "x": 404.4166666666667, + "x": 442.58333333333337, "y": 1646 }, { - "x": 404.4166666666667, + "x": 442.58333333333337, "y": 1844 }, { - "x": 440.5, + "x": 463.66666666666663, "y": 1844 }, { - "x": 441, + "x": 464, "y": 1945 } ], @@ -1751,35 +1751,35 @@ "labelPercentage": 0, "route": [ { - "x": 441, + "x": 464, "y": 2026 }, { - "x": 440.5, + "x": 463.66666666666663, "y": 2121 }, { - "x": 353.5, + "x": 361.66666666666663, "y": 2121 }, { - "x": 353.5, + "x": 361.66666666666663, "y": 2322 }, { - "x": 329.5833333333333, + "x": 351.66666666666663, "y": 2322 }, { - "x": 329.5833333333333, + "x": 351.66666666666663, "y": 2423 }, { - "x": 304.5833333333333, + "x": 341.66666666666663, "y": 2423 }, { - "x": 305, + "x": 342, "y": 2518 } ], @@ -1815,28 +1815,28 @@ "labelPercentage": 0, "route": [ { - "x": 305, + "x": 342, "y": 2599 }, { - "x": 304.5833333333333, - "y": 2980 + "x": 341.66666666666663, + "y": 2880 }, { - "x": 124.66666666666669, - "y": 2980 + "x": 94.66666666666666, + "y": 2880 }, { - "x": 124.66666666666669, - "y": 3474 + "x": 94.66666666666666, + "y": 3424 }, { - "x": 141.5, - "y": 3474 + "x": 160.58333333333331, + "y": 3424 }, { - "x": 141.5, - "y": 3569 + "x": 160.58333333333331, + "y": 3519 } ], "animated": false, @@ -1871,19 +1871,19 @@ "labelPercentage": 0, "route": [ { - "x": 340, + "x": 363, "y": 2031 }, { - "x": 340, + "x": 363.16666666666663, "y": 2071 }, { - "x": 396, + "x": 434.16666666666663, "y": 2071 }, { - "x": 396, + "x": 434.16666666666663, "y": 2161 } ], @@ -1919,19 +1919,11 @@ "labelPercentage": 0, "route": [ { - "x": 396, + "x": 434.16666666666663, "y": 2227 }, { - "x": 396, - "y": 2423 - }, - { - "x": 397.0833333333333, - "y": 2423 - }, - { - "x": 397.0833333333333, + "x": 434.16666666666663, "y": 2525.5 } ], @@ -1967,11 +1959,11 @@ "labelPercentage": 0, "route": [ { - "x": 397.0833333333333, + "x": 434.16666666666663, "y": 2591.5 }, { - "x": 397.0833333333333, + "x": 434.16666666666663, "y": 2669 } ], @@ -2011,11 +2003,11 @@ "y": 783 }, { - "x": 235.66666666666666, + "x": 235.66666666666669, "y": 823 }, { - "x": 188.16666666666666, + "x": 188.16666666666669, "y": 823 }, { @@ -2023,7 +2015,7 @@ "y": 1008 }, { - "x": 93.5, + "x": 93.49999999999999, "y": 1008 }, { @@ -2111,7 +2103,7 @@ "y": 1646 }, { - "x": 202.66666666666666, + "x": 202.66666666666669, "y": 1646 }, { @@ -2159,7 +2151,7 @@ "y": 1646 }, { - "x": 153, + "x": 153.00000000000003, "y": 1646 }, { @@ -2252,15 +2244,15 @@ }, { "x": 148.33333333333334, - "y": 3424 + "y": 3374 }, { - "x": 224, - "y": 3424 + "x": 243.08333333333331, + "y": 3374 }, { - "x": 224, - "y": 3569 + "x": 243.08333333333331, + "y": 3519 } ], "animated": false, @@ -2295,20 +2287,20 @@ "labelPercentage": 0, "route": [ { - "x": 397.0833333333333, + "x": 434.16666666666663, "y": 2735 }, { - "x": 397.0833333333333, + "x": 434.16666666666663, "y": 2830 }, { - "x": 426, + "x": 451.8333333333333, "y": 2830 }, { - "x": 426, - "y": 3075 + "x": 452, + "y": 3025 } ], "animated": false, @@ -2348,15 +2340,15 @@ }, { "x": 166.33333333333334, - "y": 2880 + "y": 2830 }, { - "x": 380, - "y": 2880 + "x": 405.83333333333337, + "y": 2830 }, { - "x": 380, - "y": 3075 + "x": 406, + "y": 3025 } ], "animated": false, @@ -2391,12 +2383,12 @@ "labelPercentage": 0, "route": [ { - "x": 403, - "y": 3193 + "x": 429, + "y": 3143 }, { - "x": 403, - "y": 3263 + "x": 428.83333333333337, + "y": 3213 } ], "animated": false, @@ -2431,20 +2423,20 @@ "labelPercentage": 0, "route": [ { - "x": 403, - "y": 3329 + "x": 428.83333333333337, + "y": 3279 }, { - "x": 403, - "y": 3424 + "x": 428.83333333333337, + "y": 3374 }, { - "x": 306, - "y": 3424 + "x": 325.08333333333337, + "y": 3374 }, { - "x": 306, - "y": 3569 + "x": 325.08333333333337, + "y": 3519 } ], "animated": false, @@ -2479,12 +2471,12 @@ "labelPercentage": 0, "route": [ { - "x": 306, - "y": 3635 + "x": 325.0833333333333, + "y": 3585 }, { - "x": 306, - "y": 3760 + "x": 325, + "y": 3710 } ], "animated": false, @@ -2523,15 +2515,15 @@ "y": 1804 }, { - "x": 202.66666666666666, + "x": 202.66666666666669, "y": 1844 }, { - "x": 326.6666666666667, + "x": 349.83333333333337, "y": 1844 }, { - "x": 327, + "x": 350, "y": 1953 } ], diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index df13869d7..cff36b15f 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-890461011 .fill-N1{fill:#0A0F25;} + .d2-890461011 .fill-N2{fill:#676C7E;} + .d2-890461011 .fill-N3{fill:#9499AB;} + .d2-890461011 .fill-N4{fill:#CFD2DD;} + .d2-890461011 .fill-N5{fill:#DEE1EB;} + .d2-890461011 .fill-N6{fill:#EEF1F8;} + .d2-890461011 .fill-N7{fill:#FFFFFF;} + .d2-890461011 .fill-B1{fill:#0D32B2;} + .d2-890461011 .fill-B2{fill:#0D32B2;} + .d2-890461011 .fill-B3{fill:#E3E9FD;} + .d2-890461011 .fill-B4{fill:#E3E9FD;} + .d2-890461011 .fill-B5{fill:#EDF0FD;} + .d2-890461011 .fill-B6{fill:#F7F8FE;} + .d2-890461011 .fill-AA2{fill:#4A6FF3;} + .d2-890461011 .fill-AA4{fill:#EDF0FD;} + .d2-890461011 .fill-AA5{fill:#F7F8FE;} + .d2-890461011 .fill-AB4{fill:#EDF0FD;} + .d2-890461011 .fill-AB5{fill:#F7F8FE;} + .d2-890461011 .stroke-N1{stroke:#0A0F25;} + .d2-890461011 .stroke-N2{stroke:#676C7E;} + .d2-890461011 .stroke-N3{stroke:#9499AB;} + .d2-890461011 .stroke-N4{stroke:#CFD2DD;} + .d2-890461011 .stroke-N5{stroke:#DEE1EB;} + .d2-890461011 .stroke-N6{stroke:#EEF1F8;} + .d2-890461011 .stroke-N7{stroke:#FFFFFF;} + .d2-890461011 .stroke-B1{stroke:#0D32B2;} + .d2-890461011 .stroke-B2{stroke:#0D32B2;} + .d2-890461011 .stroke-B3{stroke:#E3E9FD;} + .d2-890461011 .stroke-B4{stroke:#E3E9FD;} + .d2-890461011 .stroke-B5{stroke:#EDF0FD;} + .d2-890461011 .stroke-B6{stroke:#F7F8FE;} + .d2-890461011 .stroke-AA2{stroke:#4A6FF3;} + .d2-890461011 .stroke-AA4{stroke:#EDF0FD;} + .d2-890461011 .stroke-AA5{stroke:#F7F8FE;} + .d2-890461011 .stroke-AB4{stroke:#EDF0FD;} + .d2-890461011 .stroke-AB5{stroke:#F7F8FE;} + .d2-890461011 .background-color-N1{background-color:#0A0F25;} + .d2-890461011 .background-color-N2{background-color:#676C7E;} + .d2-890461011 .background-color-N3{background-color:#9499AB;} + .d2-890461011 .background-color-N4{background-color:#CFD2DD;} + .d2-890461011 .background-color-N5{background-color:#DEE1EB;} + .d2-890461011 .background-color-N6{background-color:#EEF1F8;} + .d2-890461011 .background-color-N7{background-color:#FFFFFF;} + .d2-890461011 .background-color-B1{background-color:#0D32B2;} + .d2-890461011 .background-color-B2{background-color:#0D32B2;} + .d2-890461011 .background-color-B3{background-color:#E3E9FD;} + .d2-890461011 .background-color-B4{background-color:#E3E9FD;} + .d2-890461011 .background-color-B5{background-color:#EDF0FD;} + .d2-890461011 .background-color-B6{background-color:#F7F8FE;} + .d2-890461011 .background-color-AA2{background-color:#4A6FF3;} + .d2-890461011 .background-color-AA4{background-color:#EDF0FD;} + .d2-890461011 .background-color-AA5{background-color:#F7F8FE;} + .d2-890461011 .background-color-AB4{background-color:#EDF0FD;} + .d2-890461011 .background-color-AB5{background-color:#F7F8FE;} + .d2-890461011 .color-N1{color:#0A0F25;} + .d2-890461011 .color-N2{color:#676C7E;} + .d2-890461011 .color-N3{color:#9499AB;} + .d2-890461011 .color-N4{color:#CFD2DD;} + .d2-890461011 .color-N5{color:#DEE1EB;} + .d2-890461011 .color-N6{color:#EEF1F8;} + .d2-890461011 .color-N7{color:#FFFFFF;} + .d2-890461011 .color-B1{color:#0D32B2;} + .d2-890461011 .color-B2{color:#0D32B2;} + .d2-890461011 .color-B3{color:#E3E9FD;} + .d2-890461011 .color-B4{color:#E3E9FD;} + .d2-890461011 .color-B5{color:#EDF0FD;} + .d2-890461011 .color-B6{color:#F7F8FE;} + .d2-890461011 .color-AA2{color:#4A6FF3;} + .d2-890461011 .color-AA4{color:#EDF0FD;} + .d2-890461011 .color-AA5{color:#F7F8FE;} + .d2-890461011 .color-AB4{color:#EDF0FD;} + .d2-890461011 .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 3dbc47c74..b4ffe6b6b 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 432, + "x": 417, "y": 1718 }, "width": 53, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 505, + "x": 490, "y": 1718 }, "width": 54, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 505, + "x": 490, "y": 1854 }, "width": 53, @@ -212,7 +212,7 @@ "id": "f", "type": "rectangle", "pos": { - "x": 579, + "x": 564, "y": 1718 }, "width": 51, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 198, + "x": 170, "y": 1718 }, "width": 80, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 418, + "x": 403, "y": 1011 }, "width": 546, @@ -376,7 +376,7 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 690, + "x": 675, "y": 1061 }, "width": 222, @@ -417,7 +417,7 @@ "id": "i.j.k", "type": "rectangle", "pos": { - "x": 740, + "x": 725, "y": 1111 }, "width": 53, @@ -458,7 +458,7 @@ "id": "i.j.l", "type": "rectangle", "pos": { - "x": 813, + "x": 798, "y": 1111 }, "width": 49, @@ -499,7 +499,7 @@ "id": "i.m", "type": "rectangle", "pos": { - "x": 468, + "x": 453, "y": 1377 }, "width": 200, @@ -540,7 +540,7 @@ "id": "i.n", "type": "rectangle", "pos": { - "x": 688, + "x": 673, "y": 1417 }, "width": 53, @@ -581,7 +581,7 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 761, + "x": 746, "y": 1317 }, "width": 153, @@ -622,7 +622,7 @@ "id": "i.o.p", "type": "rectangle", "pos": { - "x": 811, + "x": 796, "y": 1367 }, "width": 53, @@ -663,7 +663,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 865, + "x": 895, "y": 1718 }, "width": 80, @@ -1385,19 +1385,19 @@ "labelPercentage": 0, "route": [ { - "x": 766.5833333333333, + "x": 751.5833333333333, "y": 1177 }, { - "x": 766.5833333333333, + "x": 751.5833333333333, "y": 1272 }, { - "x": 618.0833333333333, + "x": 603.0833333333333, "y": 1272 }, { - "x": 618.0833333333333, + "x": 603.0833333333333, "y": 1377.625 } ], @@ -1433,11 +1433,11 @@ "labelPercentage": 0, "route": [ { - "x": 837.5833333333333, + "x": 822.5833333333333, "y": 1177 }, { - "x": 837.5833333333333, + "x": 822.5833333333333, "y": 1367 } ], @@ -1473,27 +1473,27 @@ "labelPercentage": 0, "route": [ { - "x": 925.75, + "x": 955.75, "y": 1718 }, { - "x": 925.75, + "x": 955.75, "y": 1578 }, { - "x": 974.0833333333333, + "x": 989.0833333333333, "y": 1578 }, { - "x": 974.0833333333333, + "x": 989.0833333333333, "y": 966 }, { - "x": 568.0833333333333, + "x": 553.0833333333333, "y": 966 }, { - "x": 568.0833333333333, + "x": 553.0833333333333, "y": 1377.625 } ], @@ -1529,19 +1529,19 @@ "labelPercentage": 0, "route": [ { - "x": 634.7499999999999, + "x": 619.7499999999999, "y": 1443.625 }, { - "x": 634.7499999999999, + "x": 619.7499999999999, "y": 1628 }, { - "x": 885.75, + "x": 915.75, "y": 1628 }, { - "x": 885.75, + "x": 915.75, "y": 1718 } ], @@ -1577,19 +1577,19 @@ "labelPercentage": 0, "route": [ { - "x": 714.5833333333333, + "x": 699.5833333333333, "y": 1483 }, { - "x": 714.5833333333333, + "x": 699.5833333333333, "y": 1578 }, { - "x": 905.75, + "x": 935.75, "y": 1578 }, { - "x": 905.75, + "x": 935.75, "y": 1718 } ], @@ -1625,19 +1625,19 @@ "labelPercentage": 0, "route": [ { - "x": 534.7499999999999, + "x": 519.7499999999999, "y": 1443.625 }, { - "x": 534.7499999999999, + "x": 519.7499999999999, "y": 1628 }, { - "x": 458.91666666666663, + "x": 443.91666666666663, "y": 1628 }, { - "x": 458.91666666666663, + "x": 443.91666666666663, "y": 1718 } ], @@ -1673,19 +1673,19 @@ "labelPercentage": 0, "route": [ { - "x": 568.0833333333333, + "x": 553.0833333333333, "y": 1443.625 }, { - "x": 568.0833333333333, + "x": 553.0833333333333, "y": 1678 }, { - "x": 532.4166666666666, + "x": 517.4166666666666, "y": 1678 }, { - "x": 532.4166666666666, + "x": 517.4166666666666, "y": 1718 } ], @@ -1721,19 +1721,19 @@ "labelPercentage": 0, "route": [ { - "x": 501.4166666666666, + "x": 486.4166666666666, "y": 1443.625 }, { - "x": 501.4166666666666, + "x": 486.4166666666666, "y": 1578 }, { - "x": 251.66666666666663, + "x": 224.16666666666663, "y": 1578 }, { - "x": 251.66666666666663, + "x": 224.16666666666663, "y": 1718 } ], @@ -1769,19 +1769,19 @@ "labelPercentage": 0, "route": [ { - "x": 601.4166666666665, + "x": 586.4166666666665, "y": 1443.625 }, { - "x": 601.4166666666665, + "x": 586.4166666666665, "y": 1578 }, { - "x": 604.9166666666666, + "x": 589.9166666666666, "y": 1578 }, { - "x": 604.9166666666666, + "x": 589.9166666666666, "y": 1718 } ], @@ -1817,11 +1817,11 @@ "labelPercentage": 0, "route": [ { - "x": 532.4166666666666, + "x": 517.4166666666666, "y": 1784 }, { - "x": 532.4166666666666, + "x": 517.4166666666666, "y": 1854 } ], @@ -2081,11 +2081,11 @@ "y": 966 }, { - "x": 518.0833333333333, + "x": 503.08333333333326, "y": 966 }, { - "x": 518.0833333333333, + "x": 503.08333333333326, "y": 1377.625 } ], @@ -2125,7 +2125,15 @@ "y": 617 }, { - "x": 224.9999999999999, + "x": 225, + "y": 966 + }, + { + "x": 197.5, + "y": 966 + }, + { + "x": 197.4999999999999, "y": 1718 } ], diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index a1f68fd7b..129050c4a 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-2860125219 .fill-N1{fill:#0A0F25;} + .d2-2860125219 .fill-N2{fill:#676C7E;} + .d2-2860125219 .fill-N3{fill:#9499AB;} + .d2-2860125219 .fill-N4{fill:#CFD2DD;} + .d2-2860125219 .fill-N5{fill:#DEE1EB;} + .d2-2860125219 .fill-N6{fill:#EEF1F8;} + .d2-2860125219 .fill-N7{fill:#FFFFFF;} + .d2-2860125219 .fill-B1{fill:#0D32B2;} + .d2-2860125219 .fill-B2{fill:#0D32B2;} + .d2-2860125219 .fill-B3{fill:#E3E9FD;} + .d2-2860125219 .fill-B4{fill:#E3E9FD;} + .d2-2860125219 .fill-B5{fill:#EDF0FD;} + .d2-2860125219 .fill-B6{fill:#F7F8FE;} + .d2-2860125219 .fill-AA2{fill:#4A6FF3;} + .d2-2860125219 .fill-AA4{fill:#EDF0FD;} + .d2-2860125219 .fill-AA5{fill:#F7F8FE;} + .d2-2860125219 .fill-AB4{fill:#EDF0FD;} + .d2-2860125219 .fill-AB5{fill:#F7F8FE;} + .d2-2860125219 .stroke-N1{stroke:#0A0F25;} + .d2-2860125219 .stroke-N2{stroke:#676C7E;} + .d2-2860125219 .stroke-N3{stroke:#9499AB;} + .d2-2860125219 .stroke-N4{stroke:#CFD2DD;} + .d2-2860125219 .stroke-N5{stroke:#DEE1EB;} + .d2-2860125219 .stroke-N6{stroke:#EEF1F8;} + .d2-2860125219 .stroke-N7{stroke:#FFFFFF;} + .d2-2860125219 .stroke-B1{stroke:#0D32B2;} + .d2-2860125219 .stroke-B2{stroke:#0D32B2;} + .d2-2860125219 .stroke-B3{stroke:#E3E9FD;} + .d2-2860125219 .stroke-B4{stroke:#E3E9FD;} + .d2-2860125219 .stroke-B5{stroke:#EDF0FD;} + .d2-2860125219 .stroke-B6{stroke:#F7F8FE;} + .d2-2860125219 .stroke-AA2{stroke:#4A6FF3;} + .d2-2860125219 .stroke-AA4{stroke:#EDF0FD;} + .d2-2860125219 .stroke-AA5{stroke:#F7F8FE;} + .d2-2860125219 .stroke-AB4{stroke:#EDF0FD;} + .d2-2860125219 .stroke-AB5{stroke:#F7F8FE;} + .d2-2860125219 .background-color-N1{background-color:#0A0F25;} + .d2-2860125219 .background-color-N2{background-color:#676C7E;} + .d2-2860125219 .background-color-N3{background-color:#9499AB;} + .d2-2860125219 .background-color-N4{background-color:#CFD2DD;} + .d2-2860125219 .background-color-N5{background-color:#DEE1EB;} + .d2-2860125219 .background-color-N6{background-color:#EEF1F8;} + .d2-2860125219 .background-color-N7{background-color:#FFFFFF;} + .d2-2860125219 .background-color-B1{background-color:#0D32B2;} + .d2-2860125219 .background-color-B2{background-color:#0D32B2;} + .d2-2860125219 .background-color-B3{background-color:#E3E9FD;} + .d2-2860125219 .background-color-B4{background-color:#E3E9FD;} + .d2-2860125219 .background-color-B5{background-color:#EDF0FD;} + .d2-2860125219 .background-color-B6{background-color:#F7F8FE;} + .d2-2860125219 .background-color-AA2{background-color:#4A6FF3;} + .d2-2860125219 .background-color-AA4{background-color:#EDF0FD;} + .d2-2860125219 .background-color-AA5{background-color:#F7F8FE;} + .d2-2860125219 .background-color-AB4{background-color:#EDF0FD;} + .d2-2860125219 .background-color-AB5{background-color:#F7F8FE;} + .d2-2860125219 .color-N1{color:#0A0F25;} + .d2-2860125219 .color-N2{color:#676C7E;} + .d2-2860125219 .color-N3{color:#9499AB;} + .d2-2860125219 .color-N4{color:#CFD2DD;} + .d2-2860125219 .color-N5{color:#DEE1EB;} + .d2-2860125219 .color-N6{color:#EEF1F8;} + .d2-2860125219 .color-N7{color:#FFFFFF;} + .d2-2860125219 .color-B1{color:#0D32B2;} + .d2-2860125219 .color-B2{color:#0D32B2;} + .d2-2860125219 .color-B3{color:#E3E9FD;} + .d2-2860125219 .color-B4{color:#E3E9FD;} + .d2-2860125219 .color-B5{color:#EDF0FD;} + .d2-2860125219 .color-B6{color:#F7F8FE;} + .d2-2860125219 .color-AA2{color:#4A6FF3;} + .d2-2860125219 .color-AA4{color:#EDF0FD;} + .d2-2860125219 .color-AA5{color:#F7F8FE;} + .d2-2860125219 .color-AB4{color:#EDF0FD;} + .d2-2860125219 .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 + \ 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 85c7e36b3..7d091e448 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 291, + "x": 413, "y": 882 }, "width": 160, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 391, - "y": 1274 + "x": 553, + "y": 1174 }, "width": 120, "height": 66, @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 333, + "x": 464, "y": 294 }, "width": 120, @@ -130,7 +130,7 @@ "id": "d", "type": "rectangle", "pos": { - "x": 401, + "x": 553, "y": 686 }, "width": 120, @@ -171,7 +171,7 @@ "id": "e", "type": "rectangle", "pos": { - "x": 514, + "x": 666, "y": 882 }, "width": 80, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 538, - "y": 1078 + "x": 726, + "y": 1028 }, "width": 120, "height": 66, @@ -253,7 +253,7 @@ "id": "g", "type": "rectangle", "pos": { - "x": 485, + "x": 658, "y": 12 }, "width": 80, @@ -294,7 +294,7 @@ "id": "h", "type": "rectangle", "pos": { - "x": 630, + "x": 840, "y": 158 }, "width": 53, @@ -335,7 +335,7 @@ "id": "i", "type": "rectangle", "pos": { - "x": 632, + "x": 842, "y": 294 }, "width": 49, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 617, + "x": 827, "y": 540 }, "width": 80, @@ -417,7 +417,7 @@ "id": "k", "type": "rectangle", "pos": { - "x": 541, + "x": 693, "y": 686 }, "width": 53, @@ -458,7 +458,7 @@ "id": "l", "type": "rectangle", "pos": { - "x": 20, + "x": 12, "y": 882 }, "width": 80, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 50, - "y": 1274 + "x": 75, + "y": 1174 }, "width": 120, "height": 66, @@ -540,7 +540,7 @@ "id": "n", "type": "rectangle", "pos": { - "x": 12, + "x": 22, "y": 686 }, "width": 200, @@ -581,7 +581,7 @@ "id": "o", "type": "rectangle", "pos": { - "x": 154, + "x": 196, "y": 882 }, "width": 80, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 127, - "y": 1078 + "x": 173, + "y": 1028 }, "width": 120, "height": 66, @@ -663,7 +663,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 153, + "x": 217, "y": 12 }, "width": 80, @@ -704,7 +704,7 @@ "id": "r", "type": "rectangle", "pos": { - "x": 247, + "x": 354, "y": 158 }, "width": 51, @@ -745,7 +745,7 @@ "id": "s", "type": "rectangle", "pos": { - "x": 233, + "x": 340, "y": 294 }, "width": 80, @@ -786,7 +786,7 @@ "id": "t", "type": "rectangle", "pos": { - "x": 229, + "x": 315, "y": 540 }, "width": 80, @@ -827,7 +827,7 @@ "id": "u", "type": "rectangle", "pos": { - "x": 255, + "x": 357, "y": 686 }, "width": 80, @@ -893,20 +893,20 @@ "labelPercentage": 0, "route": [ { - "x": 371.24999999999994, + "x": 493.33333333333326, "y": 948 }, { - "x": 371.24999999999994, - "y": 1184 + "x": 493.33333333333326, + "y": 1134 }, { - "x": 421.16666666666663, - "y": 1184 + "x": 583.3333333333333, + "y": 1134 }, { - "x": 421.16666666666663, - "y": 1274 + "x": 583.3333333333333, + "y": 1174 } ], "animated": false, @@ -941,27 +941,19 @@ "labelPercentage": 0, "route": [ { - "x": 393.0833333333333, + "x": 524.3333333333333, "y": 360 }, { - "x": 393.0833333333333, + "x": 524.3333333333333, "y": 500 }, { - "x": 387.41666666666663, + "x": 509.33333333333326, "y": 500 }, { - "x": 387.41666666666663, - "y": 792 - }, - { - "x": 387.24999999999994, - "y": 792 - }, - { - "x": 387.24999999999994, + "x": 509.33333333333326, "y": 882 } ], @@ -997,19 +989,19 @@ "labelPercentage": 0, "route": [ { - "x": 431.24999999999994, + "x": 583.3333333333333, "y": 752 }, { - "x": 431.24999999999994, + "x": 583.3333333333333, "y": 792 }, { - "x": 419.24999999999994, + "x": 541.3333333333333, "y": 792 }, { - "x": 419.24999999999994, + "x": 541.3333333333333, "y": 882 } ], @@ -1045,20 +1037,12 @@ "labelPercentage": 0, "route": [ { - "x": 461.24999999999994, + "x": 613.3333333333333, "y": 752 }, { - "x": 461.24999999999994, - "y": 1184 - }, - { - "x": 451.16666666666663, - "y": 1184 - }, - { - "x": 451.16666666666663, - "y": 1274 + "x": 613.3333333333333, + "y": 1174 } ], "animated": false, @@ -1093,19 +1077,19 @@ "labelPercentage": 0, "route": [ { - "x": 491.24999999999994, + "x": 643.3333333333333, "y": 752 }, { - "x": 491.24999999999994, + "x": 643.3333333333333, "y": 792 }, { - "x": 541.0833333333333, + "x": 693.1666666666666, "y": 792 }, { - "x": 541.0833333333333, + "x": 693.1666666666666, "y": 882 } ], @@ -1141,20 +1125,20 @@ "labelPercentage": 0, "route": [ { - "x": 554.4166666666665, + "x": 706.5, "y": 948 }, { - "x": 554.4166666666665, + "x": 706.5, "y": 988 }, { - "x": 568.5833333333333, + "x": 756.4999999999999, "y": 988 }, { - "x": 568.5833333333333, - "y": 1078 + "x": 756.4999999999999, + "y": 1028 } ], "animated": false, @@ -1189,20 +1173,20 @@ "labelPercentage": 0, "route": [ { - "x": 598.5833333333333, - "y": 1144 + "x": 786.4999999999999, + "y": 1094 }, { - "x": 598.5833333333333, - "y": 1234 + "x": 786.4999999999999, + "y": 1134 }, { - "x": 481.16666666666663, - "y": 1234 + "x": 643.3333333333333, + "y": 1134 }, { - "x": 481.16666666666663, - "y": 1274 + "x": 643.3333333333333, + "y": 1174 } ], "animated": false, @@ -1237,28 +1221,20 @@ "labelPercentage": 0, "route": [ { - "x": 423.0833333333333, + "x": 554.3333333333333, "y": 360 }, { - "x": 423.0833333333333, + "x": 554.3333333333333, "y": 400 }, { - "x": 604.4166666666665, + "x": 786.4999999999999, "y": 400 }, { - "x": 604.4166666666665, - "y": 988 - }, - { - "x": 598.5833333333333, - "y": 988 - }, - { - "x": 598.5833333333333, - "y": 1078 + "x": 786.4999999999999, + "y": 1028 } ], "animated": false, @@ -1293,19 +1269,19 @@ "labelPercentage": 0, "route": [ { - "x": 512, + "x": 685.0833333333333, "y": 78 }, { - "x": 512, + "x": 685.0833333333333, "y": 118 }, { - "x": 393.0833333333333, + "x": 524.3333333333333, "y": 118 }, { - "x": 393.0833333333333, + "x": 524.3333333333333, "y": 294 } ], @@ -1341,19 +1317,19 @@ "labelPercentage": 0, "route": [ { - "x": 538.6666666666667, + "x": 711.75, "y": 78 }, { - "x": 538.6666666666667, + "x": 711.75, "y": 118 }, { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 118 }, { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 158 } ], @@ -1389,11 +1365,11 @@ "labelPercentage": 0, "route": [ { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 224 }, { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 294 } ], @@ -1429,11 +1405,11 @@ "labelPercentage": 0, "route": [ { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 360 }, { - "x": 657.0833333333333, + "x": 867.4999999999999, "y": 540 } ], @@ -1469,19 +1445,19 @@ "labelPercentage": 0, "route": [ { - "x": 643.75, + "x": 854.1666666666666, "y": 606 }, { - "x": 643.75, + "x": 854.1666666666666, "y": 646 }, { - "x": 567.75, + "x": 719.8333333333333, "y": 646 }, { - "x": 567.75, + "x": 719.8333333333333, "y": 686 } ], @@ -1517,11 +1493,11 @@ "labelPercentage": 0, "route": [ { - "x": 567.75, + "x": 719.8333333333333, "y": 752 }, { - "x": 567.75, + "x": 719.8333333333333, "y": 882 } ], @@ -1557,20 +1533,20 @@ "labelPercentage": 0, "route": [ { - "x": 670.4166666666667, + "x": 880.8333333333333, "y": 606 }, { - "x": 670.4166666666665, - "y": 1038 + "x": 880.8333333333333, + "y": 988 }, { - "x": 628.5833333333333, - "y": 1038 + "x": 816.4999999999999, + "y": 988 }, { - "x": 628.5833333333333, - "y": 1078 + "x": 816.4999999999999, + "y": 1028 } ], "animated": false, @@ -1605,20 +1581,20 @@ "labelPercentage": 0, "route": [ { - "x": 60.33333333333333, + "x": 52, "y": 948 }, { - "x": 60.33333333333333, - "y": 1184 + "x": 52, + "y": 1134 }, { - "x": 80.16666666666669, - "y": 1184 + "x": 105.33333333333326, + "y": 1134 }, { - "x": 80.16666666666669, - "y": 1274 + "x": 105.33333333333326, + "y": 1174 } ], "animated": false, @@ -1653,19 +1629,19 @@ "labelPercentage": 0, "route": [ { - "x": 45.33333333333333, + "x": 55.33333333333337, "y": 752 }, { - "x": 45.33333333333333, + "x": 55.33333333333337, "y": 792 }, { - "x": 47, + "x": 38.66666666666663, "y": 792 }, { - "x": 47, + "x": 38.66666666666663, "y": 882 } ], @@ -1701,19 +1677,19 @@ "labelPercentage": 0, "route": [ { - "x": 78.66666666666666, + "x": 88.66666666666663, "y": 752 }, { - "x": 78.66666666666666, - "y": 792 + "x": 88.66666666666663, + "y": 842 }, { - "x": 73.66666666666666, - "y": 792 + "x": 65.33333333333337, + "y": 842 }, { - "x": 73.66666666666666, + "x": 65.33333333333337, "y": 882 } ], @@ -1749,20 +1725,28 @@ "labelPercentage": 0, "route": [ { - "x": 111.99999999999999, + "x": 122, "y": 752 }, { - "x": 112, - "y": 1184 + "x": 122, + "y": 842 }, { - "x": 110.16666666666669, - "y": 1184 + "x": 132, + "y": 842 }, { - "x": 110.16666666666669, - "y": 1274 + "x": 132, + "y": 1134 + }, + { + "x": 135.33333333333326, + "y": 1134 + }, + { + "x": 135.33333333333326, + "y": 1174 } ], "animated": false, @@ -1797,19 +1781,19 @@ "labelPercentage": 0, "route": [ { - "x": 178.66666666666663, + "x": 188.66666666666663, "y": 752 }, { - "x": 178.66666666666663, + "x": 188.66666666666663, "y": 792 }, { - "x": 180.83333333333331, + "x": 222.9999999999999, "y": 792 }, { - "x": 180.83333333333331, + "x": 222.9999999999999, "y": 882 } ], @@ -1845,20 +1829,20 @@ "labelPercentage": 0, "route": [ { - "x": 194.16666666666666, + "x": 236.33333333333326, "y": 948 }, { - "x": 194.16666666666666, + "x": 236.33333333333326, "y": 988 }, { - "x": 187.5, + "x": 233, "y": 988 }, { - "x": 187.5, - "y": 1078 + "x": 233, + "y": 1028 } ], "animated": false, @@ -1893,20 +1877,20 @@ "labelPercentage": 0, "route": [ { - "x": 187.5, - "y": 1144 + "x": 233, + "y": 1094 }, { - "x": 187.5, - "y": 1184 + "x": 233, + "y": 1134 }, { - "x": 140.16666666666669, - "y": 1184 + "x": 165.33333333333326, + "y": 1134 }, { - "x": 140.16666666666669, - "y": 1274 + "x": 165.33333333333326, + "y": 1174 } ], "animated": false, @@ -1941,28 +1925,28 @@ "labelPercentage": 0, "route": [ { - "x": 145.33333333333331, + "x": 155.33333333333326, "y": 752 }, { - "x": 145.33333333333331, + "x": 155.33333333333326, "y": 792 }, { - "x": 143.16666666666666, + "x": 150.83333333333326, "y": 792 }, { - "x": 143.16666666666666, + "x": 150.83333333333326, "y": 988 }, { - "x": 157.5, + "x": 203, "y": 988 }, { - "x": 157.5, - "y": 1078 + "x": 203, + "y": 1028 } ], "animated": false, @@ -1997,19 +1981,19 @@ "labelPercentage": 0, "route": [ { - "x": 180.24999999999997, + "x": 243.9999999999999, "y": 78 }, { - "x": 180.24999999999997, + "x": 243.9999999999999, "y": 118 }, { - "x": 112, + "x": 122, "y": 118 }, { - "x": 112, + "x": 122, "y": 686 } ], @@ -2045,19 +2029,19 @@ "labelPercentage": 0, "route": [ { - "x": 206.91666666666666, + "x": 270.66666666666663, "y": 78 }, { - "x": 206.91666666666666, + "x": 270.66666666666663, "y": 118 }, { - "x": 273.0833333333333, + "x": 380, "y": 118 }, { - "x": 273.0833333333333, + "x": 380, "y": 158 } ], @@ -2093,11 +2077,11 @@ "labelPercentage": 0, "route": [ { - "x": 273.0833333333333, + "x": 380, "y": 224 }, { - "x": 273.0833333333333, + "x": 380, "y": 294 } ], @@ -2133,19 +2117,19 @@ "labelPercentage": 0, "route": [ { - "x": 259.75, + "x": 366.6666666666667, "y": 360 }, { - "x": 259.75, + "x": 366.6666666666667, "y": 400 }, { - "x": 256.33333333333326, + "x": 341.8333333333333, "y": 400 }, { - "x": 256.33333333333326, + "x": 341.8333333333333, "y": 540 } ], @@ -2181,19 +2165,19 @@ "labelPercentage": 0, "route": [ { - "x": 282.99999999999994, + "x": 368.49999999999994, "y": 606 }, { - "x": 282.99999999999994, + "x": 368.49999999999994, "y": 646 }, { - "x": 295.16666666666663, + "x": 397.33333333333326, "y": 646 }, { - "x": 295.16666666666663, + "x": 397.33333333333326, "y": 686 } ], @@ -2229,19 +2213,19 @@ "labelPercentage": 0, "route": [ { - "x": 281.8333333333333, + "x": 383.99999999999994, "y": 752 }, { - "x": 281.8333333333333, + "x": 383.99999999999994, "y": 792 }, { - "x": 207.5, + "x": 249.66666666666663, "y": 792 }, { - "x": 207.5, + "x": 249.66666666666663, "y": 882 } ], @@ -2277,28 +2261,28 @@ "labelPercentage": 0, "route": [ { - "x": 256.33333333333326, + "x": 341.8333333333333, "y": 606 }, { - "x": 256.33333333333326, + "x": 341.8333333333333, "y": 646 }, { - "x": 244.16666666666663, + "x": 316.33333333333326, "y": 646 }, { - "x": 244.16666666666663, - "y": 1038 + "x": 316.33333333333326, + "y": 988 }, { - "x": 217.5, - "y": 1038 + "x": 263, + "y": 988 }, { - "x": 217.5, - "y": 1078 + "x": 263, + "y": 1028 } ], "animated": false, @@ -2333,19 +2317,19 @@ "labelPercentage": 0, "route": [ { - "x": 363.0833333333333, + "x": 494.3333333333333, "y": 360 }, { - "x": 363.0833333333333, + "x": 494.3333333333333, "y": 450 }, { - "x": 282.99999999999994, + "x": 368.49999999999994, "y": 450 }, { - "x": 282.99999999999994, + "x": 368.49999999999994, "y": 540 } ], @@ -2381,27 +2365,19 @@ "labelPercentage": 0, "route": [ { - "x": 286.41666666666663, + "x": 393.3333333333333, "y": 360 }, { - "x": 286.41666666666663, - "y": 400 + "x": 393.3333333333333, + "y": 500 }, { - "x": 345.16666666666663, - "y": 400 + "x": 477.33333333333326, + "y": 500 }, { - "x": 345.16666666666663, - "y": 792 - }, - { - "x": 355.24999999999994, - "y": 792 - }, - { - "x": 355.24999999999994, + "x": 477.33333333333326, "y": 882 } ], @@ -2437,19 +2413,19 @@ "labelPercentage": 0, "route": [ { - "x": 308.49999999999994, + "x": 410.6666666666666, "y": 752 }, { - "x": 308.49999999999994, - "y": 842 + "x": 410.6666666666666, + "y": 792 }, { - "x": 323.24999999999994, - "y": 842 + "x": 445.33333333333326, + "y": 792 }, { - "x": 323.24999999999994, + "x": 445.33333333333326, "y": 882 } ], diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index 27c8d8232..1bcdeff99 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-3394510602 .fill-N1{fill:#0A0F25;} + .d2-3394510602 .fill-N2{fill:#676C7E;} + .d2-3394510602 .fill-N3{fill:#9499AB;} + .d2-3394510602 .fill-N4{fill:#CFD2DD;} + .d2-3394510602 .fill-N5{fill:#DEE1EB;} + .d2-3394510602 .fill-N6{fill:#EEF1F8;} + .d2-3394510602 .fill-N7{fill:#FFFFFF;} + .d2-3394510602 .fill-B1{fill:#0D32B2;} + .d2-3394510602 .fill-B2{fill:#0D32B2;} + .d2-3394510602 .fill-B3{fill:#E3E9FD;} + .d2-3394510602 .fill-B4{fill:#E3E9FD;} + .d2-3394510602 .fill-B5{fill:#EDF0FD;} + .d2-3394510602 .fill-B6{fill:#F7F8FE;} + .d2-3394510602 .fill-AA2{fill:#4A6FF3;} + .d2-3394510602 .fill-AA4{fill:#EDF0FD;} + .d2-3394510602 .fill-AA5{fill:#F7F8FE;} + .d2-3394510602 .fill-AB4{fill:#EDF0FD;} + .d2-3394510602 .fill-AB5{fill:#F7F8FE;} + .d2-3394510602 .stroke-N1{stroke:#0A0F25;} + .d2-3394510602 .stroke-N2{stroke:#676C7E;} + .d2-3394510602 .stroke-N3{stroke:#9499AB;} + .d2-3394510602 .stroke-N4{stroke:#CFD2DD;} + .d2-3394510602 .stroke-N5{stroke:#DEE1EB;} + .d2-3394510602 .stroke-N6{stroke:#EEF1F8;} + .d2-3394510602 .stroke-N7{stroke:#FFFFFF;} + .d2-3394510602 .stroke-B1{stroke:#0D32B2;} + .d2-3394510602 .stroke-B2{stroke:#0D32B2;} + .d2-3394510602 .stroke-B3{stroke:#E3E9FD;} + .d2-3394510602 .stroke-B4{stroke:#E3E9FD;} + .d2-3394510602 .stroke-B5{stroke:#EDF0FD;} + .d2-3394510602 .stroke-B6{stroke:#F7F8FE;} + .d2-3394510602 .stroke-AA2{stroke:#4A6FF3;} + .d2-3394510602 .stroke-AA4{stroke:#EDF0FD;} + .d2-3394510602 .stroke-AA5{stroke:#F7F8FE;} + .d2-3394510602 .stroke-AB4{stroke:#EDF0FD;} + .d2-3394510602 .stroke-AB5{stroke:#F7F8FE;} + .d2-3394510602 .background-color-N1{background-color:#0A0F25;} + .d2-3394510602 .background-color-N2{background-color:#676C7E;} + .d2-3394510602 .background-color-N3{background-color:#9499AB;} + .d2-3394510602 .background-color-N4{background-color:#CFD2DD;} + .d2-3394510602 .background-color-N5{background-color:#DEE1EB;} + .d2-3394510602 .background-color-N6{background-color:#EEF1F8;} + .d2-3394510602 .background-color-N7{background-color:#FFFFFF;} + .d2-3394510602 .background-color-B1{background-color:#0D32B2;} + .d2-3394510602 .background-color-B2{background-color:#0D32B2;} + .d2-3394510602 .background-color-B3{background-color:#E3E9FD;} + .d2-3394510602 .background-color-B4{background-color:#E3E9FD;} + .d2-3394510602 .background-color-B5{background-color:#EDF0FD;} + .d2-3394510602 .background-color-B6{background-color:#F7F8FE;} + .d2-3394510602 .background-color-AA2{background-color:#4A6FF3;} + .d2-3394510602 .background-color-AA4{background-color:#EDF0FD;} + .d2-3394510602 .background-color-AA5{background-color:#F7F8FE;} + .d2-3394510602 .background-color-AB4{background-color:#EDF0FD;} + .d2-3394510602 .background-color-AB5{background-color:#F7F8FE;} + .d2-3394510602 .color-N1{color:#0A0F25;} + .d2-3394510602 .color-N2{color:#676C7E;} + .d2-3394510602 .color-N3{color:#9499AB;} + .d2-3394510602 .color-N4{color:#CFD2DD;} + .d2-3394510602 .color-N5{color:#DEE1EB;} + .d2-3394510602 .color-N6{color:#EEF1F8;} + .d2-3394510602 .color-N7{color:#FFFFFF;} + .d2-3394510602 .color-B1{color:#0D32B2;} + .d2-3394510602 .color-B2{color:#0D32B2;} + .d2-3394510602 .color-B3{color:#E3E9FD;} + .d2-3394510602 .color-B4{color:#E3E9FD;} + .d2-3394510602 .color-B5{color:#EDF0FD;} + .d2-3394510602 .color-B6{color:#F7F8FE;} + .d2-3394510602 .color-AA2{color:#4A6FF3;} + .d2-3394510602 .color-AA4{color:#EDF0FD;} + .d2-3394510602 .color-AA5{color:#F7F8FE;} + .d2-3394510602 .color-AB4{color:#EDF0FD;} + .d2-3394510602 .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 3903d86dc..aac27377d 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 97, + "x": 82, "y": 781 }, "width": 120, @@ -368,19 +368,19 @@ "y": 223 }, { - "x": 93.25, + "x": 78.25, "y": 223 }, { - "x": 93.25, - "y": 741 + "x": 78.25, + "y": 691 }, { - "x": 127.5, - "y": 741 + "x": 112.5, + "y": 691 }, { - "x": 127.5, + "x": 112.5, "y": 781 } ], @@ -424,11 +424,11 @@ "y": 691 }, { - "x": 157.5, + "x": 142.5, "y": 691 }, { - "x": 157.5, + "x": 142.5, "y": 781 } ], @@ -469,14 +469,14 @@ }, { "x": 220.75, - "y": 691 + "y": 741 }, { - "x": 187.5, - "y": 691 + "x": 172.5, + "y": 741 }, { - "x": 187.5, + "x": 172.5, "y": 781 } ], 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 06e38b332..5f3cbdc10 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-701430010 .fill-N1{fill:#0A0F25;} + .d2-701430010 .fill-N2{fill:#676C7E;} + .d2-701430010 .fill-N3{fill:#9499AB;} + .d2-701430010 .fill-N4{fill:#CFD2DD;} + .d2-701430010 .fill-N5{fill:#DEE1EB;} + .d2-701430010 .fill-N6{fill:#EEF1F8;} + .d2-701430010 .fill-N7{fill:#FFFFFF;} + .d2-701430010 .fill-B1{fill:#0D32B2;} + .d2-701430010 .fill-B2{fill:#0D32B2;} + .d2-701430010 .fill-B3{fill:#E3E9FD;} + .d2-701430010 .fill-B4{fill:#E3E9FD;} + .d2-701430010 .fill-B5{fill:#EDF0FD;} + .d2-701430010 .fill-B6{fill:#F7F8FE;} + .d2-701430010 .fill-AA2{fill:#4A6FF3;} + .d2-701430010 .fill-AA4{fill:#EDF0FD;} + .d2-701430010 .fill-AA5{fill:#F7F8FE;} + .d2-701430010 .fill-AB4{fill:#EDF0FD;} + .d2-701430010 .fill-AB5{fill:#F7F8FE;} + .d2-701430010 .stroke-N1{stroke:#0A0F25;} + .d2-701430010 .stroke-N2{stroke:#676C7E;} + .d2-701430010 .stroke-N3{stroke:#9499AB;} + .d2-701430010 .stroke-N4{stroke:#CFD2DD;} + .d2-701430010 .stroke-N5{stroke:#DEE1EB;} + .d2-701430010 .stroke-N6{stroke:#EEF1F8;} + .d2-701430010 .stroke-N7{stroke:#FFFFFF;} + .d2-701430010 .stroke-B1{stroke:#0D32B2;} + .d2-701430010 .stroke-B2{stroke:#0D32B2;} + .d2-701430010 .stroke-B3{stroke:#E3E9FD;} + .d2-701430010 .stroke-B4{stroke:#E3E9FD;} + .d2-701430010 .stroke-B5{stroke:#EDF0FD;} + .d2-701430010 .stroke-B6{stroke:#F7F8FE;} + .d2-701430010 .stroke-AA2{stroke:#4A6FF3;} + .d2-701430010 .stroke-AA4{stroke:#EDF0FD;} + .d2-701430010 .stroke-AA5{stroke:#F7F8FE;} + .d2-701430010 .stroke-AB4{stroke:#EDF0FD;} + .d2-701430010 .stroke-AB5{stroke:#F7F8FE;} + .d2-701430010 .background-color-N1{background-color:#0A0F25;} + .d2-701430010 .background-color-N2{background-color:#676C7E;} + .d2-701430010 .background-color-N3{background-color:#9499AB;} + .d2-701430010 .background-color-N4{background-color:#CFD2DD;} + .d2-701430010 .background-color-N5{background-color:#DEE1EB;} + .d2-701430010 .background-color-N6{background-color:#EEF1F8;} + .d2-701430010 .background-color-N7{background-color:#FFFFFF;} + .d2-701430010 .background-color-B1{background-color:#0D32B2;} + .d2-701430010 .background-color-B2{background-color:#0D32B2;} + .d2-701430010 .background-color-B3{background-color:#E3E9FD;} + .d2-701430010 .background-color-B4{background-color:#E3E9FD;} + .d2-701430010 .background-color-B5{background-color:#EDF0FD;} + .d2-701430010 .background-color-B6{background-color:#F7F8FE;} + .d2-701430010 .background-color-AA2{background-color:#4A6FF3;} + .d2-701430010 .background-color-AA4{background-color:#EDF0FD;} + .d2-701430010 .background-color-AA5{background-color:#F7F8FE;} + .d2-701430010 .background-color-AB4{background-color:#EDF0FD;} + .d2-701430010 .background-color-AB5{background-color:#F7F8FE;} + .d2-701430010 .color-N1{color:#0A0F25;} + .d2-701430010 .color-N2{color:#676C7E;} + .d2-701430010 .color-N3{color:#9499AB;} + .d2-701430010 .color-N4{color:#CFD2DD;} + .d2-701430010 .color-N5{color:#DEE1EB;} + .d2-701430010 .color-N6{color:#EEF1F8;} + .d2-701430010 .color-N7{color:#FFFFFF;} + .d2-701430010 .color-B1{color:#0D32B2;} + .d2-701430010 .color-B2{color:#0D32B2;} + .d2-701430010 .color-B3{color:#E3E9FD;} + .d2-701430010 .color-B4{color:#E3E9FD;} + .d2-701430010 .color-B5{color:#EDF0FD;} + .d2-701430010 .color-B6{color:#F7F8FE;} + .d2-701430010 .color-AA2{color:#4A6FF3;} + .d2-701430010 .color-AA4{color:#EDF0FD;} + .d2-701430010 .color-AA5{color:#F7F8FE;} + .d2-701430010 .color-AB4{color:#EDF0FD;} + .d2-701430010 .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/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index a9d38c550..831efef63 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -1584,7 +1584,7 @@ "id": "finally", "type": "queue", "pos": { - "x": 1259, + "x": 1274, "y": 1536 }, "width": 1034, @@ -1625,7 +1625,7 @@ "id": "finally.sequence", "type": "sequence_diagram", "pos": { - "x": 1309, + "x": 1324, "y": 1586 }, "width": 934, @@ -1666,7 +1666,7 @@ "id": "finally.sequence.scorer", "type": "rectangle", "pos": { - "x": 1321, + "x": 1336, "y": 1669 }, "width": 100, @@ -1707,7 +1707,7 @@ "id": "finally.sequence.concept", "type": "rectangle", "pos": { - "x": 1471, + "x": 1486, "y": 1669 }, "width": 100, @@ -1748,7 +1748,7 @@ "id": "finally.sequence.essayRubric", "type": "rectangle", "pos": { - "x": 1611, + "x": 1626, "y": 1669 }, "width": 126, @@ -1789,7 +1789,7 @@ "id": "finally.sequence.item", "type": "rectangle", "pos": { - "x": 1774, + "x": 1789, "y": 1669 }, "width": 100, @@ -1830,7 +1830,7 @@ "id": "finally.sequence.itemOutcome", "type": "rectangle", "pos": { - "x": 1914, + "x": 1929, "y": 1669 }, "width": 137, @@ -1871,7 +1871,7 @@ "id": "finally.sequence.itemResponse", "type": "rectangle", "pos": { - "x": 2091, + "x": 2106, "y": 1669 }, "width": 140, @@ -1912,7 +1912,7 @@ "id": "finally.sequence.itemResponse.a", "type": "rectangle", "pos": { - "x": 2155, + "x": 2170, "y": 1795 }, "width": 12, @@ -1952,7 +1952,7 @@ "id": "finally.sequence.item.a", "type": "rectangle", "pos": { - "x": 1818, + "x": 1833, "y": 1785 }, "width": 12, @@ -1992,7 +1992,7 @@ "id": "finally.sequence.item.a.b", "type": "rectangle", "pos": { - "x": 1814, + "x": 1829, "y": 1795 }, "width": 20, @@ -2032,7 +2032,7 @@ "id": "finally.sequence.essayRubric.a", "type": "rectangle", "pos": { - "x": 1668, + "x": 1683, "y": 1845 }, "width": 12, @@ -2072,7 +2072,7 @@ "id": "finally.sequence.essayRubric.a.b", "type": "rectangle", "pos": { - "x": 1664, + "x": 1679, "y": 1855 }, "width": 20, @@ -2112,7 +2112,7 @@ "id": "finally.sequence.essayRubric.a.b.c", "type": "rectangle", "pos": { - "x": 1660, + "x": 1675, "y": 1865 }, "width": 28, @@ -2152,7 +2152,7 @@ "id": "finally.sequence.concept.a", "type": "rectangle", "pos": { - "x": 1515, + "x": 1530, "y": 1905 }, "width": 12, @@ -2192,7 +2192,7 @@ "id": "finally.sequence.concept.a.b", "type": "rectangle", "pos": { - "x": 1511, + "x": 1526, "y": 1915 }, "width": 20, @@ -2232,7 +2232,7 @@ "id": "finally.sequence.concept.a.b.c", "type": "rectangle", "pos": { - "x": 1507, + "x": 1522, "y": 1925 }, "width": 28, @@ -2272,7 +2272,7 @@ "id": "finally.sequence.concept.a.b.c.d", "type": "rectangle", "pos": { - "x": 1503, + "x": 1518, "y": 1935 }, "width": 36, @@ -2312,7 +2312,7 @@ "id": "finally.sequence.itemOutcome.a", "type": "rectangle", "pos": { - "x": 1977, + "x": 1992, "y": 2035 }, "width": 12, @@ -2352,7 +2352,7 @@ "id": "finally.sequence.itemOutcome.a.b", "type": "rectangle", "pos": { - "x": 1973, + "x": 1988, "y": 2045 }, "width": 20, @@ -2392,7 +2392,7 @@ "id": "finally.sequence.itemOutcome.a.b.c", "type": "rectangle", "pos": { - "x": 1969, + "x": 1984, "y": 2055 }, "width": 28, @@ -2432,7 +2432,7 @@ "id": "finally.sequence.itemOutcome.a.b.c.d", "type": "rectangle", "pos": { - "x": 1965, + "x": 1980, "y": 2065 }, "width": 36, @@ -2472,7 +2472,7 @@ "id": "finally.sequence.itemOutcome.a.b.c.d.e", "type": "rectangle", "pos": { - "x": 1961, + "x": 1976, "y": 2075 }, "width": 44, @@ -2512,7 +2512,7 @@ "id": "finally.sequence.scorer.abc", "type": "rectangle", "pos": { - "x": 1365, + "x": 1380, "y": 2145 }, "width": 12, @@ -2552,7 +2552,7 @@ "id": "finally.sequence.itemResponse.c", "type": "rectangle", "pos": { - "x": 2155, + "x": 2170, "y": 2285 }, "width": 12, @@ -3793,11 +3793,11 @@ "y": 1491 }, { - "x": 1776.5, + "x": 1791.5, "y": 1491 }, { - "x": 1776.5, + "x": 1791.5, "y": 1586 } ], @@ -3841,19 +3841,19 @@ "y": 160 }, { - "x": 2050, + "x": 2080, "y": 160 }, { - "x": 2050, + "x": 2080, "y": 1491 }, { - "x": 1786.5, + "x": 1801.5, "y": 1491 }, { - "x": 1787, + "x": 1802, "y": 1536 } ], @@ -3889,11 +3889,11 @@ "labelPercentage": 0, "route": [ { - "x": 2155.5, + "x": 2170.5, "y": 1805 }, { - "x": 1834.5, + "x": 1849.5, "y": 1805 } ], @@ -3929,11 +3929,11 @@ "labelPercentage": 0, "route": [ { - "x": 1814.5, + "x": 1829.5, "y": 1875 }, { - "x": 1688.5, + "x": 1703.5, "y": 1875 } ], @@ -3969,11 +3969,11 @@ "labelPercentage": 0, "route": [ { - "x": 1660.5, + "x": 1675.5, "y": 1945 }, { - "x": 1539.5, + "x": 1554.5, "y": 1945 } ], @@ -4009,11 +4009,11 @@ "labelPercentage": 0, "route": [ { - "x": 1818.5, + "x": 1833.5, "y": 2015 }, { - "x": 1684.5, + "x": 1699.5, "y": 2015 } ], @@ -4049,11 +4049,11 @@ "labelPercentage": 0, "route": [ { - "x": 1539.5, + "x": 1554.5, "y": 2085 }, { - "x": 1961, + "x": 1976, "y": 2085 } ], @@ -4089,11 +4089,11 @@ "labelPercentage": 0, "route": [ { - "x": 1377.5, + "x": 1392.5, "y": 2155 }, { - "x": 1818.5, + "x": 1833.5, "y": 2155 } ], @@ -4129,11 +4129,11 @@ "labelPercentage": 0, "route": [ { - "x": 1961, + "x": 1976, "y": 2225 }, { - "x": 1371.5, + "x": 1386.5, "y": 2225 } ], @@ -4169,11 +4169,11 @@ "labelPercentage": 0, "route": [ { - "x": 1371.5, + "x": 1386.5, "y": 2295 }, { - "x": 2155.5, + "x": 2170.5, "y": 2295 } ], @@ -4689,11 +4689,11 @@ "labelPercentage": 0, "route": [ { - "x": 1371.5, + "x": 1386.5, "y": 1735 }, { - "x": 1371.5, + "x": 1386.5, "y": 2365 } ], @@ -4729,11 +4729,11 @@ "labelPercentage": 0, "route": [ { - "x": 1521.5, + "x": 1536.5, "y": 1735 }, { - "x": 1521.5, + "x": 1536.5, "y": 2365 } ], @@ -4769,11 +4769,11 @@ "labelPercentage": 0, "route": [ { - "x": 1674.5, + "x": 1689.5, "y": 1735 }, { - "x": 1674.5, + "x": 1689.5, "y": 2365 } ], @@ -4809,11 +4809,11 @@ "labelPercentage": 0, "route": [ { - "x": 1824.5, + "x": 1839.5, "y": 1735 }, { - "x": 1824.5, + "x": 1839.5, "y": 2365 } ], @@ -4849,11 +4849,11 @@ "labelPercentage": 0, "route": [ { - "x": 1983, + "x": 1998, "y": 1735 }, { - "x": 1983, + "x": 1998, "y": 2365 } ], @@ -4889,11 +4889,11 @@ "labelPercentage": 0, "route": [ { - "x": 2161.5, + "x": 2176.5, "y": 1735 }, { - "x": 2161.5, + "x": 2176.5, "y": 2365 } ], diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index ca9f72d28..d8f357d75 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - + .d2-3726828926 .fill-N1{fill:#0A0F25;} + .d2-3726828926 .fill-N2{fill:#676C7E;} + .d2-3726828926 .fill-N3{fill:#9499AB;} + .d2-3726828926 .fill-N4{fill:#CFD2DD;} + .d2-3726828926 .fill-N5{fill:#DEE1EB;} + .d2-3726828926 .fill-N6{fill:#EEF1F8;} + .d2-3726828926 .fill-N7{fill:#FFFFFF;} + .d2-3726828926 .fill-B1{fill:#0D32B2;} + .d2-3726828926 .fill-B2{fill:#0D32B2;} + .d2-3726828926 .fill-B3{fill:#E3E9FD;} + .d2-3726828926 .fill-B4{fill:#E3E9FD;} + .d2-3726828926 .fill-B5{fill:#EDF0FD;} + .d2-3726828926 .fill-B6{fill:#F7F8FE;} + .d2-3726828926 .fill-AA2{fill:#4A6FF3;} + .d2-3726828926 .fill-AA4{fill:#EDF0FD;} + .d2-3726828926 .fill-AA5{fill:#F7F8FE;} + .d2-3726828926 .fill-AB4{fill:#EDF0FD;} + .d2-3726828926 .fill-AB5{fill:#F7F8FE;} + .d2-3726828926 .stroke-N1{stroke:#0A0F25;} + .d2-3726828926 .stroke-N2{stroke:#676C7E;} + .d2-3726828926 .stroke-N3{stroke:#9499AB;} + .d2-3726828926 .stroke-N4{stroke:#CFD2DD;} + .d2-3726828926 .stroke-N5{stroke:#DEE1EB;} + .d2-3726828926 .stroke-N6{stroke:#EEF1F8;} + .d2-3726828926 .stroke-N7{stroke:#FFFFFF;} + .d2-3726828926 .stroke-B1{stroke:#0D32B2;} + .d2-3726828926 .stroke-B2{stroke:#0D32B2;} + .d2-3726828926 .stroke-B3{stroke:#E3E9FD;} + .d2-3726828926 .stroke-B4{stroke:#E3E9FD;} + .d2-3726828926 .stroke-B5{stroke:#EDF0FD;} + .d2-3726828926 .stroke-B6{stroke:#F7F8FE;} + .d2-3726828926 .stroke-AA2{stroke:#4A6FF3;} + .d2-3726828926 .stroke-AA4{stroke:#EDF0FD;} + .d2-3726828926 .stroke-AA5{stroke:#F7F8FE;} + .d2-3726828926 .stroke-AB4{stroke:#EDF0FD;} + .d2-3726828926 .stroke-AB5{stroke:#F7F8FE;} + .d2-3726828926 .background-color-N1{background-color:#0A0F25;} + .d2-3726828926 .background-color-N2{background-color:#676C7E;} + .d2-3726828926 .background-color-N3{background-color:#9499AB;} + .d2-3726828926 .background-color-N4{background-color:#CFD2DD;} + .d2-3726828926 .background-color-N5{background-color:#DEE1EB;} + .d2-3726828926 .background-color-N6{background-color:#EEF1F8;} + .d2-3726828926 .background-color-N7{background-color:#FFFFFF;} + .d2-3726828926 .background-color-B1{background-color:#0D32B2;} + .d2-3726828926 .background-color-B2{background-color:#0D32B2;} + .d2-3726828926 .background-color-B3{background-color:#E3E9FD;} + .d2-3726828926 .background-color-B4{background-color:#E3E9FD;} + .d2-3726828926 .background-color-B5{background-color:#EDF0FD;} + .d2-3726828926 .background-color-B6{background-color:#F7F8FE;} + .d2-3726828926 .background-color-AA2{background-color:#4A6FF3;} + .d2-3726828926 .background-color-AA4{background-color:#EDF0FD;} + .d2-3726828926 .background-color-AA5{background-color:#F7F8FE;} + .d2-3726828926 .background-color-AB4{background-color:#EDF0FD;} + .d2-3726828926 .background-color-AB5{background-color:#F7F8FE;} + .d2-3726828926 .color-N1{color:#0A0F25;} + .d2-3726828926 .color-N2{color:#676C7E;} + .d2-3726828926 .color-N3{color:#9499AB;} + .d2-3726828926 .color-N4{color:#CFD2DD;} + .d2-3726828926 .color-N5{color:#DEE1EB;} + .d2-3726828926 .color-N6{color:#EEF1F8;} + .d2-3726828926 .color-N7{color:#FFFFFF;} + .d2-3726828926 .color-B1{color:#0D32B2;} + .d2-3726828926 .color-B2{color:#0D32B2;} + .d2-3726828926 .color-B3{color:#E3E9FD;} + .d2-3726828926 .color-B4{color:#E3E9FD;} + .d2-3726828926 .color-B5{color:#EDF0FD;} + .d2-3726828926 .color-B6{color:#F7F8FE;} + .d2-3726828926 .color-AA2{color:#4A6FF3;} + .d2-3726828926 .color-AA4{color:#EDF0FD;} + .d2-3726828926 .color-AA5{color:#F7F8FE;} + .d2-3726828926 .color-AB4{color:#EDF0FD;} + .d2-3726828926 .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}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 52f3d6fdf..a5aaa99c4 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": 467, + "x": 559, "y": 148 }, "width": 64, @@ -48,7 +48,7 @@ "id": "FL", "type": "rectangle", "pos": { - "x": 459, + "x": 551, "y": 294 }, "width": 80, @@ -89,7 +89,7 @@ "id": "GA", "type": "rectangle", "pos": { - "x": 459, + "x": 551, "y": 590 }, "width": 80, @@ -130,7 +130,7 @@ "id": "MS", "type": "rectangle", "pos": { - "x": 342, + "x": 405, "y": 836 }, "width": 160, @@ -171,7 +171,7 @@ "id": "TN", "type": "rectangle", "pos": { - "x": 459, + "x": 524, "y": 3116 }, "width": 280, @@ -212,7 +212,7 @@ "id": "AK", "type": "rectangle", "pos": { - "x": 910, + "x": 1003, "y": 12 }, "width": 66, @@ -253,7 +253,7 @@ "id": "AZ", "type": "rectangle", "pos": { - "x": 1456, + "x": 1724, "y": 836 }, "width": 65, @@ -294,7 +294,7 @@ "id": "CA", "type": "rectangle", "pos": { - "x": 1448, + "x": 1716, "y": 1232 }, "width": 80, @@ -335,7 +335,7 @@ "id": "NV", "type": "rectangle", "pos": { - "x": 1385, + "x": 1656, "y": 1628 }, "width": 160, @@ -376,7 +376,7 @@ "id": "NM", "type": "rectangle", "pos": { - "x": 968, + "x": 1121, "y": 1974 }, "width": 120, @@ -417,7 +417,7 @@ "id": "UT", "type": "rectangle", "pos": { - "x": 1294, + "x": 1522, "y": 3116 }, "width": 160, @@ -458,7 +458,7 @@ "id": "AR", "type": "rectangle", "pos": { - "x": 362, + "x": 425, "y": 294 }, "width": 66, @@ -499,7 +499,7 @@ "id": "LA", "type": "rectangle", "pos": { - "x": 355, + "x": 418, "y": 590 }, "width": 80, @@ -540,7 +540,7 @@ "id": "MO", "type": "rectangle", "pos": { - "x": 968, + "x": 1151, "y": 1232 }, "width": 240, @@ -581,7 +581,7 @@ "id": "OK", "type": "rectangle", "pos": { - "x": 616, + "x": 719, "y": 2520 }, "width": 200, @@ -622,7 +622,7 @@ "id": "TX", "type": "rectangle", "pos": { - "x": 352, + "x": 387, "y": 3362 }, "width": 160, @@ -663,7 +663,7 @@ "id": "OR", "type": "rectangle", "pos": { - "x": 1421, + "x": 1692, "y": 1974 }, "width": 120, @@ -704,7 +704,7 @@ "id": "CO", "type": "rectangle", "pos": { - "x": 685, + "x": 794, "y": 590 }, "width": 66, @@ -745,7 +745,7 @@ "id": "KS", "type": "rectangle", "pos": { - "x": 865, + "x": 1018, "y": 836 }, "width": 80, @@ -786,7 +786,7 @@ "id": "NE", "type": "rectangle", "pos": { - "x": 908, + "x": 1061, "y": 1628 }, "width": 200, @@ -827,7 +827,7 @@ "id": "WY", "type": "rectangle", "pos": { - "x": 1220, + "x": 1446, "y": 3708 }, "width": 240, @@ -868,7 +868,7 @@ "id": "CT", "type": "rectangle", "pos": { - "x": 105, + "x": 120, "y": 1232 }, "width": 64, @@ -909,7 +909,7 @@ "id": "MA", "type": "rectangle", "pos": { - "x": 97, + "x": 112, "y": 1628 }, "width": 80, @@ -950,7 +950,7 @@ "id": "NY", "type": "rectangle", "pos": { - "x": 70, + "x": 85, "y": 2520 }, "width": 160, @@ -991,7 +991,7 @@ "id": "RI", "type": "rectangle", "pos": { - "x": 64, + "x": 87, "y": 3362 }, "width": 120, @@ -1032,7 +1032,7 @@ "id": "DE", "type": "rectangle", "pos": { - "x": 213, + "x": 259, "y": 1232 }, "width": 63, @@ -1073,7 +1073,7 @@ "id": "MD", "type": "rectangle", "pos": { - "x": 205, + "x": 250, "y": 1628 }, "width": 80, @@ -1114,7 +1114,7 @@ "id": "NJ", "type": "rectangle", "pos": { - "x": 192, + "x": 237, "y": 1974 }, "width": 80, @@ -1155,7 +1155,7 @@ "id": "PA", "type": "rectangle", "pos": { - "x": 145, + "x": 190, "y": 3116 }, "width": 200, @@ -1196,7 +1196,7 @@ "id": "NC", "type": "rectangle", "pos": { - "x": 472, + "x": 565, "y": 1974 }, "width": 80, @@ -1237,7 +1237,7 @@ "id": "SC", "type": "rectangle", "pos": { - "x": 472, + "x": 565, "y": 2520 }, "width": 80, @@ -1278,7 +1278,7 @@ "id": "HI", "type": "rectangle", "pos": { - "x": 831, + "x": 924, "y": 12 }, "width": 59, @@ -1319,7 +1319,7 @@ "id": "ID", "type": "rectangle", "pos": { - "x": 1318, + "x": 1576, "y": 836 }, "width": 59, @@ -1360,7 +1360,7 @@ "id": "MT", "type": "rectangle", "pos": { - "x": 1237, + "x": 1465, "y": 1232 }, "width": 80, @@ -1401,7 +1401,7 @@ "id": "WA", "type": "rectangle", "pos": { - "x": 1453, + "x": 1724, "y": 3362 }, "width": 80, @@ -1442,7 +1442,7 @@ "id": "IL", "type": "rectangle", "pos": { - "x": 996, + "x": 1089, "y": 12 }, "width": 57, @@ -1483,7 +1483,7 @@ "id": "IN", "type": "rectangle", "pos": { - "x": 984, + "x": 1077, "y": 148 }, "width": 80, @@ -1524,7 +1524,7 @@ "id": "IA", "type": "rectangle", "pos": { - "x": 1182, + "x": 1425, "y": 294 }, "width": 80, @@ -1565,7 +1565,7 @@ "id": "MI", "type": "rectangle", "pos": { - "x": 771, + "x": 880, "y": 590 }, "width": 120, @@ -1606,7 +1606,7 @@ "id": "KY", "type": "rectangle", "pos": { - "x": 904, + "x": 997, "y": 294 }, "width": 120, @@ -1647,7 +1647,7 @@ "id": "WI", "type": "rectangle", "pos": { - "x": 1113, + "x": 1281, "y": 2520 }, "width": 160, @@ -1688,7 +1688,7 @@ "id": "OH", "type": "rectangle", "pos": { - "x": 766, + "x": 899, "y": 1628 }, "width": 120, @@ -1729,7 +1729,7 @@ "id": "MN", "type": "rectangle", "pos": { - "x": 1149, + "x": 1385, "y": 836 }, "width": 120, @@ -1770,7 +1770,7 @@ "id": "SD", "type": "rectangle", "pos": { - "x": 1162, + "x": 1405, "y": 1974 }, "width": 200, @@ -1811,7 +1811,7 @@ "id": "VA", "type": "rectangle", "pos": { - "x": 555, + "x": 620, "y": 3362 }, "width": 160, @@ -1852,7 +1852,7 @@ "id": "WV", "type": "rectangle", "pos": { - "x": 469, + "x": 522, "y": 3708 }, "width": 200, @@ -1975,7 +1975,7 @@ "id": "VT", "type": "rectangle", "pos": { - "x": 34, + "x": 42, "y": 3708 }, "width": 120, @@ -2016,7 +2016,7 @@ "id": "ND", "type": "rectangle", "pos": { - "x": 1235, + "x": 1478, "y": 1628 }, "width": 120, @@ -2082,11 +2082,11 @@ "labelPercentage": 0, "route": [ { - "x": 499.16666666666663, + "x": 591.8333333333333, "y": 214 }, { - "x": 499.16666666666663, + "x": 591.8333333333333, "y": 294 } ], @@ -2122,11 +2122,11 @@ "labelPercentage": 0, "route": [ { - "x": 485.83333333333326, + "x": 578.4999999999999, "y": 360 }, { - "x": 485.83333333333326, + "x": 578.4999999999999, "y": 590 } ], @@ -2162,19 +2162,19 @@ "labelPercentage": 0, "route": [ { - "x": 485.83333333333326, + "x": 578.4999999999999, "y": 656 }, { - "x": 485.83333333333326, + "x": 578.4999999999999, "y": 696 }, { - "x": 462.4999999999999, + "x": 525.1666666666665, "y": 696 }, { - "x": 462.4999999999999, + "x": 525.1666666666665, "y": 836 } ], @@ -2210,19 +2210,19 @@ "labelPercentage": 0, "route": [ { - "x": 406.4999999999999, + "x": 469.1666666666665, "y": 902 }, { - "x": 406.4999999999999, + "x": 469.1666666666665, "y": 2776 }, { - "x": 494.7738095238095, + "x": 559.3690476190477, "y": 2776 }, { - "x": 494.7738095238095, + "x": 559.3690476190477, "y": 3116 } ], @@ -2258,11 +2258,11 @@ "labelPercentage": 0, "route": [ { - "x": 1488.6904761904761, + "x": 1756.6666666666667, "y": 902 }, { - "x": 1488.6904761904761, + "x": 1756.6666666666667, "y": 1232 } ], @@ -2298,19 +2298,19 @@ "labelPercentage": 0, "route": [ { - "x": 1475.357142857143, + "x": 1743.3333333333333, "y": 1298 }, { - "x": 1475.357142857143, + "x": 1743.3333333333333, "y": 1338 }, { - "x": 1465.357142857143, + "x": 1736.6666666666665, "y": 1338 }, { - "x": 1465.357142857143, + "x": 1736.6666666666665, "y": 1628 } ], @@ -2346,19 +2346,19 @@ "labelPercentage": 0, "route": [ { - "x": 1417.357142857143, + "x": 1688.6666666666665, "y": 1694 }, { - "x": 1417.357142857143, + "x": 1688.6666666666665, "y": 1834 }, { - "x": 1048.0238095238096, + "x": 1201.1666666666667, "y": 1834 }, { - "x": 1048.0238095238096, + "x": 1201.1666666666667, "y": 1974 } ], @@ -2394,19 +2394,19 @@ "labelPercentage": 0, "route": [ { - "x": 1058.0238095238096, + "x": 1211.1666666666667, "y": 2040 }, { - "x": 1058.0238095238096, + "x": 1211.1666666666667, "y": 2480 }, { - "x": 1358.2738095238096, + "x": 1586.4166666666667, "y": 2480 }, { - "x": 1358.2738095238096, + "x": 1586.4166666666667, "y": 3116 } ], @@ -2442,11 +2442,11 @@ "labelPercentage": 0, "route": [ { - "x": 395.83333333333326, + "x": 458.5, "y": 360 }, { - "x": 395.83333333333326, + "x": 458.5, "y": 590 } ], @@ -2482,11 +2482,11 @@ "labelPercentage": 0, "route": [ { - "x": 382.4999999999999, + "x": 445.16666666666674, "y": 656 }, { - "x": 382.4999999999999, + "x": 445.1666666666665, "y": 836 } ], @@ -2522,19 +2522,19 @@ "labelPercentage": 0, "route": [ { - "x": 470.4999999999999, + "x": 533.1666666666665, "y": 902 }, { - "x": 470.4999999999999, - "y": 1092 + "x": 533.1666666666665, + "y": 1042 }, { - "x": 1008.3333333333334, - "y": 1092 + "x": 1191.4761904761904, + "y": 1042 }, { - "x": 1008.3333333333334, + "x": 1191.4761904761904, "y": 1232 } ], @@ -2570,27 +2570,27 @@ "labelPercentage": 0, "route": [ { - "x": 1002.6190476190477, + "x": 1185.7619047619048, "y": 1298 }, { - "x": 1002.6190476190477, + "x": 1185.7619047619048, "y": 1338 }, { - "x": 672.1666666666667, + "x": 774.8333333333334, "y": 1338 }, { - "x": 672.1666666666667, + "x": 774.8333333333334, "y": 2080 }, { - "x": 649.8333333333334, + "x": 752.5000000000001, "y": 2080 }, { - "x": 649.8333333333334, + "x": 752.5000000000001, "y": 2520 } ], @@ -2626,19 +2626,19 @@ "labelPercentage": 0, "route": [ { - "x": 716.5, + "x": 819.1666666666667, "y": 2586 }, { - "x": 716.5, + "x": 819.1666666666667, "y": 2926 }, { - "x": 634.7738095238095, + "x": 699.3690476190477, "y": 2926 }, { - "x": 634.7738095238095, + "x": 699.3690476190477, "y": 3116 } ], @@ -2674,19 +2674,19 @@ "labelPercentage": 0, "route": [ { - "x": 515.7738095238095, + "x": 580.3690476190477, "y": 3182 }, { - "x": 515.7738095238095, + "x": 580.3690476190477, "y": 3222 }, { - "x": 480.7738095238095, + "x": 515.3690476190475, "y": 3222 }, { - "x": 480.7738095238095, + "x": 515.3690476190475, "y": 3362 } ], @@ -2722,19 +2722,19 @@ "labelPercentage": 0, "route": [ { - "x": 1502.0238095238096, + "x": 1770, "y": 1298 }, { - "x": 1502.0238095238096, + "x": 1770, "y": 1338 }, { - "x": 1505.357142857143, + "x": 1776.6666666666665, "y": 1338 }, { - "x": 1505.357142857143, + "x": 1776.6666666666665, "y": 1628 } ], @@ -2770,19 +2770,19 @@ "labelPercentage": 0, "route": [ { - "x": 1449.357142857143, + "x": 1720.6666666666665, "y": 1694 }, { - "x": 1449.357142857143, + "x": 1720.6666666666665, "y": 1734 }, { - "x": 1451.357142857143, + "x": 1722.6666666666665, "y": 1734 }, { - "x": 1451.357142857143, + "x": 1722.6666666666665, "y": 1974 } ], @@ -2818,19 +2818,19 @@ "labelPercentage": 0, "route": [ { - "x": 718.6071428571429, + "x": 827.6428571428571, "y": 656 }, { - "x": 718.6071428571429, + "x": 827.6428571428571, "y": 746 }, { - "x": 905.3333333333334, + "x": 1058.4761904761904, "y": 746 }, { - "x": 905.3333333333334, + "x": 1058.4761904761904, "y": 836 } ], @@ -2866,19 +2866,19 @@ "labelPercentage": 0, "route": [ { - "x": 892, + "x": 1045.142857142857, "y": 902 }, { - "x": 892, + "x": 1045.142857142857, "y": 1438 }, { - "x": 948.0238095238095, + "x": 1101.1666666666667, "y": 1438 }, { - "x": 948.0238095238095, + "x": 1101.1666666666667, "y": 1628 } ], @@ -2914,11 +2914,11 @@ "labelPercentage": 0, "route": [ { - "x": 1008.0238095238095, + "x": 1161.1666666666667, "y": 1694 }, { - "x": 1008.0238095238095, + "x": 1161.1666666666667, "y": 1974 } ], @@ -2954,19 +2954,19 @@ "labelPercentage": 0, "route": [ { - "x": 998.0238095238095, + "x": 1151.1666666666667, "y": 2040 }, { - "x": 998.0238095238095, + "x": 1151.1666666666667, "y": 2080 }, { - "x": 749.8333333333333, + "x": 852.5, "y": 2080 }, { - "x": 749.8333333333333, + "x": 852.5, "y": 2520 } ], @@ -3002,19 +3002,19 @@ "labelPercentage": 0, "route": [ { - "x": 783.1666666666666, + "x": 885.8333333333334, "y": 2586 }, { - "x": 783.1666666666666, + "x": 885.8333333333334, "y": 3076 }, { - "x": 1326.2738095238096, + "x": 1554.4166666666667, "y": 3076 }, { - "x": 1326.2738095238096, + "x": 1554.4166666666667, "y": 3116 } ], @@ -3050,27 +3050,27 @@ "labelPercentage": 0, "route": [ { - "x": 1334.2738095238096, + "x": 1562.4166666666667, "y": 3182 }, { - "x": 1334.2738095238096, + "x": 1562.4166666666667, "y": 3222 }, { - "x": 1348.047619047619, + "x": 1559.1666666666667, "y": 3222 }, { - "x": 1348.047619047619, + "x": 1559.1666666666667, "y": 3518 }, { - "x": 1357.595238095238, + "x": 1583.7142857142858, "y": 3518 }, { - "x": 1357.595238095238, + "x": 1583.7142857142858, "y": 3708 } ], @@ -3106,11 +3106,11 @@ "labelPercentage": 0, "route": [ { - "x": 137, + "x": 152.16666666666674, "y": 1298 }, { - "x": 137, + "x": 152.16666666666674, "y": 1628 } ], @@ -3146,11 +3146,11 @@ "labelPercentage": 0, "route": [ { - "x": 150.33333333333326, + "x": 165.5, "y": 1694 }, { - "x": 150.33333333333326, + "x": 165.5, "y": 2520 } ], @@ -3186,27 +3186,27 @@ "labelPercentage": 0, "route": [ { - "x": 102.33333333333326, + "x": 117.5, "y": 2586 }, { - "x": 102.33333333333326, + "x": 117.5, "y": 2626 }, { - "x": 93.91666666666652, + "x": 116.5, "y": 2626 }, { - "x": 93.91666666666652, + "x": 116.5, "y": 3222 }, { - "x": 94.91666666666652, + "x": 117.5, "y": 3222 }, { - "x": 94.91666666666652, + "x": 117.5, "y": 3362 } ], @@ -3242,11 +3242,11 @@ "labelPercentage": 0, "route": [ { - "x": 245.33333333333326, + "x": 290.5, "y": 1298 }, { - "x": 245.33333333333326, + "x": 290.5, "y": 1628 } ], @@ -3282,11 +3282,11 @@ "labelPercentage": 0, "route": [ { - "x": 232, + "x": 277.16666666666674, "y": 1694 }, { - "x": 232, + "x": 277.1666666666665, "y": 1974 } ], @@ -3322,11 +3322,11 @@ "labelPercentage": 0, "route": [ { - "x": 245.33333333333326, + "x": 290.4999999999998, "y": 2040 }, { - "x": 245.33333333333326, + "x": 290.5, "y": 3116 } ], @@ -3362,11 +3362,11 @@ "labelPercentage": 0, "route": [ { - "x": 512.5, + "x": 605.1666666666666, "y": 360 }, { - "x": 512.5, + "x": 605.1666666666666, "y": 590 } ], @@ -3402,11 +3402,11 @@ "labelPercentage": 0, "route": [ { - "x": 512.5, + "x": 605.1666666666666, "y": 656 }, { - "x": 512.4999999999999, + "x": 605.1666666666666, "y": 1974 } ], @@ -3442,11 +3442,11 @@ "labelPercentage": 0, "route": [ { - "x": 499.1666666666665, + "x": 591.8333333333333, "y": 2040 }, { - "x": 499.1666666666665, + "x": 591.8333333333333, "y": 2520 } ], @@ -3482,19 +3482,19 @@ "labelPercentage": 0, "route": [ { - "x": 499.1666666666665, + "x": 591.8333333333333, "y": 2586 }, { - "x": 499.1666666666665, + "x": 591.8333333333333, "y": 2676 }, { - "x": 564.7738095238095, + "x": 629.3690476190477, "y": 2676 }, { - "x": 564.7738095238095, + "x": 629.3690476190477, "y": 3116 } ], @@ -3530,19 +3530,19 @@ "labelPercentage": 0, "route": [ { - "x": 1347.6904761904761, + "x": 1605.8333333333333, "y": 902 }, { - "x": 1347.6904761904761, + "x": 1605.8333333333333, "y": 1142 }, { - "x": 1277.4404761904761, + "x": 1505.5833333333333, "y": 1142 }, { - "x": 1277.4404761904761, + "x": 1505.5833333333333, "y": 1232 } ], @@ -3578,19 +3578,19 @@ "labelPercentage": 0, "route": [ { - "x": 1290.7738095238096, + "x": 1518.9166666666667, "y": 1298 }, { - "x": 1290.7738095238096, + "x": 1518.9166666666667, "y": 1338 }, { - "x": 1425.357142857143, + "x": 1696.6666666666665, "y": 1338 }, { - "x": 1425.357142857143, + "x": 1696.6666666666665, "y": 1628 } ], @@ -3626,11 +3626,11 @@ "labelPercentage": 0, "route": [ { - "x": 1481.357142857143, + "x": 1752.6666666666665, "y": 1694 }, { - "x": 1481.357142857143, + "x": 1752.6666666666665, "y": 1974 } ], @@ -3666,19 +3666,19 @@ "labelPercentage": 0, "route": [ { - "x": 1451.357142857143, + "x": 1722.6666666666665, "y": 2040 }, { - "x": 1451.357142857143, + "x": 1722.6666666666665, "y": 2430 }, { - "x": 1390.2738095238096, + "x": 1618.4166666666667, "y": 2430 }, { - "x": 1390.2738095238096, + "x": 1618.4166666666667, "y": 3116 } ], @@ -3714,19 +3714,19 @@ "labelPercentage": 0, "route": [ { - "x": 1414.2738095238096, + "x": 1642.4166666666667, "y": 3182 }, { - "x": 1414.2738095238096, + "x": 1642.4166666666667, "y": 3222 }, { - "x": 1479.857142857143, + "x": 1751.1666666666667, "y": 3222 }, { - "x": 1479.857142857143, + "x": 1751.1666666666667, "y": 3362 } ], @@ -3762,19 +3762,19 @@ "labelPercentage": 0, "route": [ { - "x": 1493.1904761904761, + "x": 1764.5, "y": 3428 }, { - "x": 1493.1904761904761, + "x": 1764.5, "y": 3468 }, { - "x": 1426.1666666666665, + "x": 1652.2857142857142, "y": 3468 }, { - "x": 1426.1666666666665, + "x": 1652.2857142857142, "y": 3708 } ], @@ -3810,11 +3810,11 @@ "labelPercentage": 0, "route": [ { - "x": 1024.5595238095239, + "x": 1117.702380952381, "y": 78 }, { - "x": 1024.5595238095239, + "x": 1117.702380952381, "y": 148 } ], @@ -3850,19 +3850,19 @@ "labelPercentage": 0, "route": [ { - "x": 1037.892857142857, + "x": 1131.0357142857142, "y": 214 }, { - "x": 1037.892857142857, + "x": 1131.0357142857142, "y": 254 }, { - "x": 1222.9166666666667, + "x": 1465.6666666666665, "y": 254 }, { - "x": 1222.9166666666667, + "x": 1465.6666666666665, "y": 294 } ], @@ -3898,19 +3898,19 @@ "labelPercentage": 0, "route": [ { - "x": 1209.5833333333333, + "x": 1452.3333333333333, "y": 360 }, { - "x": 1209.5833333333333, + "x": 1452.3333333333333, "y": 500 }, { - "x": 861.6071428571428, + "x": 970.6428571428571, "y": 500 }, { - "x": 861.6071428571428, + "x": 970.6428571428571, "y": 590 } ], @@ -3946,19 +3946,19 @@ "labelPercentage": 0, "route": [ { - "x": 831.6071428571428, + "x": 940.6428571428571, "y": 590 }, { - "x": 831.6071428571428, + "x": 940.6428571428571, "y": 450 }, { - "x": 952.5595238095239, + "x": 1045.702380952381, "y": 450 }, { - "x": 952.5595238095239, + "x": 1045.702380952381, "y": 360 } ], @@ -3994,27 +3994,19 @@ "labelPercentage": 0, "route": [ { - "x": 976.5595238095239, + "x": 1069.702380952381, "y": 360 }, { - "x": 976.5595238095239, + "x": 1069.702380952381, "y": 550 }, { - "x": 1065.9166666666665, + "x": 1271.4761904761904, "y": 550 }, { - "x": 1065.9166666666665, - "y": 942 - }, - { - "x": 1088.3333333333335, - "y": 942 - }, - { - "x": 1088.3333333333335, + "x": 1271.4761904761904, "y": 1232 } ], @@ -4050,27 +4042,27 @@ "labelPercentage": 0, "route": [ { - "x": 1174.047619047619, + "x": 1357.1904761904761, "y": 1298 }, { - "x": 1174.047619047619, + "x": 1357.1904761904761, "y": 1588 }, { - "x": 1118.0238095238096, + "x": 1301.1666666666667, "y": 1588 }, { - "x": 1118.0238095238096, + "x": 1301.1666666666667, "y": 2280 }, { - "x": 1145.2738095238096, + "x": 1313.4166666666667, "y": 2280 }, { - "x": 1145.2738095238096, + "x": 1313.4166666666667, "y": 2520 } ], @@ -4106,19 +4098,19 @@ "labelPercentage": 0, "route": [ { - "x": 1011.2261904761904, + "x": 1104.3690476190477, "y": 214 }, { - "x": 1011.2261904761904, + "x": 1104.3690476190477, "y": 254 }, { - "x": 964.5595238095239, + "x": 1057.702380952381, "y": 254 }, { - "x": 964.5595238095239, + "x": 1057.702380952381, "y": 294 } ], @@ -4154,19 +4146,19 @@ "labelPercentage": 0, "route": [ { - "x": 928.5595238095239, + "x": 1021.702380952381, "y": 360 }, { - "x": 928.5595238095239, + "x": 1021.702380952381, "y": 400 }, { - "x": 801.6071428571428, + "x": 910.6428571428571, "y": 400 }, { - "x": 801.6071428571428, + "x": 910.6428571428571, "y": 590 } ], @@ -4202,27 +4194,27 @@ "labelPercentage": 0, "route": [ { - "x": 811.6071428571428, + "x": 920.6428571428571, "y": 656 }, { - "x": 811.6071428571428, + "x": 920.6428571428571, "y": 796 }, { - "x": 739.6071428571429, + "x": 833.6428571428572, "y": 796 }, { - "x": 739.6071428571429, + "x": 833.6428571428572, "y": 1388 }, { - "x": 796.5, + "x": 929.1666666666667, "y": 1388 }, { - "x": 796.5, + "x": 929.1666666666667, "y": 1628 } ], @@ -4258,19 +4250,19 @@ "labelPercentage": 0, "route": [ { - "x": 1236.25, + "x": 1479, "y": 360 }, { - "x": 1236.25, + "x": 1479, "y": 550 }, { - "x": 1229.7738095238094, + "x": 1465.3333333333333, "y": 550 }, { - "x": 1229.7738095238094, + "x": 1465.3333333333333, "y": 836 } ], @@ -4306,19 +4298,19 @@ "labelPercentage": 0, "route": [ { - "x": 1209.7738095238094, + "x": 1445.3333333333333, "y": 902 }, { - "x": 1209.7738095238094, + "x": 1445.3333333333333, "y": 1042 }, { - "x": 1128.3333333333335, + "x": 1311.4761904761904, "y": 1042 }, { - "x": 1128.3333333333335, + "x": 1311.4761904761904, "y": 1232 } ], @@ -4354,19 +4346,19 @@ "labelPercentage": 0, "route": [ { - "x": 1071.1904761904761, + "x": 1254.3333333333335, "y": 1298 }, { - "x": 1071.1904761904761, + "x": 1254.3333333333335, "y": 1438 }, { - "x": 988.0238095238095, + "x": 1141.1666666666667, "y": 1438 }, { - "x": 988.0238095238095, + "x": 1141.1666666666667, "y": 1628 } ], @@ -4402,19 +4394,19 @@ "labelPercentage": 0, "route": [ { - "x": 1041.357142857143, + "x": 1194.5, "y": 1694 }, { - "x": 1041.357142857143, + "x": 1194.5, "y": 1784 }, { - "x": 1195.7738095238096, + "x": 1438.9166666666665, "y": 1784 }, { - "x": 1195.7738095238096, + "x": 1438.9166666666665, "y": 1974 } ], @@ -4450,19 +4442,19 @@ "labelPercentage": 0, "route": [ { - "x": 1262.4404761904761, + "x": 1505.5833333333333, "y": 2040 }, { - "x": 1262.4404761904761, + "x": 1505.5833333333333, "y": 2280 }, { - "x": 1177.2738095238096, + "x": 1345.4166666666667, "y": 2280 }, { - "x": 1177.2738095238096, + "x": 1345.4166666666667, "y": 2520 } ], @@ -4498,19 +4490,19 @@ "labelPercentage": 0, "route": [ { - "x": 918.6666666666667, + "x": 1071.8095238095239, "y": 902 }, { - "x": 918.6666666666667, - "y": 1042 + "x": 1071.8095238095239, + "y": 942 }, { - "x": 1048.3333333333335, - "y": 1042 + "x": 1231.4761904761904, + "y": 942 }, { - "x": 1048.3333333333335, + "x": 1231.4761904761904, "y": 1232 } ], @@ -4546,19 +4538,19 @@ "labelPercentage": 0, "route": [ { - "x": 1105.4761904761906, + "x": 1288.6190476190477, "y": 1298 }, { - "x": 1105.4761904761906, + "x": 1288.6190476190477, "y": 1488 }, { - "x": 1028.0238095238096, + "x": 1181.1666666666667, "y": 1488 }, { - "x": 1028.0238095238096, + "x": 1181.1666666666667, "y": 1628 } ], @@ -4594,27 +4586,27 @@ "labelPercentage": 0, "route": [ { - "x": 941.3571428571429, + "x": 1094.5, "y": 1694 }, { - "x": 941.3571428571429, + "x": 1094.5, "y": 1784 }, { - "x": 694.3333333333333, + "x": 797, "y": 1784 }, { - "x": 694.3333333333333, + "x": 797, "y": 2130 }, { - "x": 683.1666666666666, + "x": 785.8333333333334, "y": 2130 }, { - "x": 683.1666666666666, + "x": 785.8333333333334, "y": 2520 } ], @@ -4650,27 +4642,27 @@ "labelPercentage": 0, "route": [ { - "x": 1000.5595238095239, + "x": 1093.702380952381, "y": 360 }, { - "x": 1000.5595238095239, + "x": 1093.702380952381, "y": 400 }, { - "x": 1279.7738095238094, + "x": 1545.3333333333333, "y": 400 }, { - "x": 1279.7738095238094, + "x": 1545.3333333333333, "y": 1092 }, { - "x": 1168.3333333333335, + "x": 1351.4761904761904, "y": 1092 }, { - "x": 1168.3333333333335, + "x": 1351.4761904761904, "y": 1232 } ], @@ -4706,19 +4698,19 @@ "labelPercentage": 0, "route": [ { - "x": 1036.904761904762, + "x": 1220.047619047619, "y": 1298 }, { - "x": 1036.904761904762, + "x": 1220.047619047619, "y": 1388 }, { - "x": 856.5, + "x": 989.1666666666667, "y": 1388 }, { - "x": 856.5, + "x": 989.1666666666667, "y": 1628 } ], @@ -4754,19 +4746,19 @@ "labelPercentage": 0, "route": [ { - "x": 826.5, + "x": 959.1666666666667, "y": 1694 }, { - "x": 826.5, + "x": 959.1666666666667, "y": 3026 }, { - "x": 704.7738095238095, + "x": 769.3690476190477, "y": 3026 }, { - "x": 704.7738095238095, + "x": 769.3690476190477, "y": 3116 } ], @@ -4802,19 +4794,19 @@ "labelPercentage": 0, "route": [ { - "x": 571.7738095238095, + "x": 636.3690476190477, "y": 3182 }, { - "x": 571.7738095238095, + "x": 636.3690476190477, "y": 3272 }, { - "x": 619.7738095238095, + "x": 684.3690476190476, "y": 3272 }, { - "x": 619.7738095238095, + "x": 684.3690476190476, "y": 3362 } ], @@ -4850,19 +4842,19 @@ "labelPercentage": 0, "route": [ { - "x": 595.7738095238095, + "x": 660.3690476190476, "y": 3428 }, { - "x": 595.7738095238095, + "x": 660.3690476190476, "y": 3468 }, { - "x": 569.9404761904761, + "x": 622.0357142857142, "y": 3468 }, { - "x": 569.9404761904761, + "x": 622.0357142857142, "y": 3708 } ], @@ -4898,19 +4890,19 @@ "labelPercentage": 0, "route": [ { - "x": 409.16666666666663, + "x": 471.83333333333326, "y": 656 }, { - "x": 409.16666666666663, + "x": 471.83333333333326, "y": 696 }, { - "x": 422.4999999999999, + "x": 485.1666666666665, "y": 696 }, { - "x": 422.4999999999999, + "x": 485.1666666666665, "y": 836 } ], @@ -4946,27 +4938,27 @@ "labelPercentage": 0, "route": [ { - "x": 374.4999999999999, + "x": 437.1666666666665, "y": 902 }, { - "x": 374.4999999999999, + "x": 437.1666666666665, "y": 942 }, { - "x": 355.33333333333326, + "x": 430.5, "y": 942 }, { - "x": 355.33333333333326, + "x": 430.5, "y": 3222 }, { - "x": 384.7738095238095, + "x": 419.3690476190475, "y": 3222 }, { - "x": 384.7738095238095, + "x": 419.3690476190475, "y": 3362 } ], @@ -5042,27 +5034,27 @@ "labelPercentage": 0, "route": [ { - "x": 258.6666666666665, + "x": 303.83333333333326, "y": 1694 }, { - "x": 258.6666666666665, + "x": 303.83333333333326, "y": 1734 }, { - "x": 282, + "x": 357.1666666666665, "y": 1734 }, { - "x": 282, + "x": 357.1666666666665, "y": 2626 }, { - "x": 278.6666666666665, + "x": 323.83333333333326, "y": 2626 }, { - "x": 278.6666666666665, + "x": 323.83333333333326, "y": 3116 } ], @@ -5098,19 +5090,19 @@ "labelPercentage": 0, "route": [ { - "x": 305.33333333333326, + "x": 350.5, "y": 3182 }, { - "x": 305.33333333333326, + "x": 350.5, "y": 3322 }, { - "x": 587.7738095238095, + "x": 652.3690476190476, "y": 3322 }, { - "x": 587.7738095238095, + "x": 652.3690476190476, "y": 3362 } ], @@ -5146,19 +5138,19 @@ "labelPercentage": 0, "route": [ { - "x": 635.7738095238095, + "x": 700.3690476190476, "y": 3428 }, { - "x": 635.7738095238095, + "x": 700.3690476190476, "y": 3518 }, { - "x": 603.2738095238094, + "x": 655.3690476190475, "y": 3518 }, { - "x": 603.2738095238094, + "x": 655.3690476190475, "y": 3708 } ], @@ -5194,11 +5186,11 @@ "labelPercentage": 0, "route": [ { - "x": 123.66666666666674, + "x": 138.83333333333348, "y": 1694 }, { - "x": 123.66666666666674, + "x": 138.83333333333348, "y": 1734 }, { @@ -5250,11 +5242,11 @@ "y": 2080 }, { - "x": 110.33333333333326, + "x": 125.5, "y": 2080 }, { - "x": 110.33333333333326, + "x": 125.5, "y": 2520 } ], @@ -5290,19 +5282,19 @@ "labelPercentage": 0, "route": [ { - "x": 134.33333333333326, + "x": 149.5, "y": 2586 }, { - "x": 134.33333333333326, + "x": 149.5, "y": 3222 }, { - "x": 124.91666666666652, + "x": 147.5, "y": 3222 }, { - "x": 124.91666666666652, + "x": 147.5, "y": 3362 } ], @@ -5338,19 +5330,19 @@ "labelPercentage": 0, "route": [ { - "x": 104.91666666666652, + "x": 127.5, "y": 3428 }, { - "x": 104.91666666666652, + "x": 127.5, "y": 3468 }, { - "x": 94.41666666666652, + "x": 102, "y": 3468 }, { - "x": 94.41666666666652, + "x": 102, "y": 3708 } ], @@ -5386,19 +5378,19 @@ "labelPercentage": 0, "route": [ { - "x": 851.6071428571428, + "x": 960.6428571428571, "y": 656 }, { - "x": 851.6071428571428, + "x": 960.6428571428571, "y": 696 }, { - "x": 1189.7738095238094, + "x": 1425.3333333333333, "y": 696 }, { - "x": 1189.7738095238094, + "x": 1425.3333333333333, "y": 836 } ], @@ -5434,19 +5426,19 @@ "labelPercentage": 0, "route": [ { - "x": 1179.7738095238094, + "x": 1415.3333333333333, "y": 902 }, { - "x": 1179.7738095238094, + "x": 1415.3333333333333, "y": 992 }, { - "x": 826.5, + "x": 959.1666666666667, "y": 992 }, { - "x": 826.5, + "x": 959.1666666666667, "y": 1628 } ], @@ -5482,27 +5474,27 @@ "labelPercentage": 0, "route": [ { - "x": 856.5, + "x": 989.1666666666667, "y": 1694 }, { - "x": 856.5, + "x": 989.1666666666667, "y": 1934 }, { - "x": 1393.5238095238096, + "x": 1651.6666666666665, "y": 1934 }, { - "x": 1393.5238095238096, + "x": 1651.6666666666665, "y": 2380 }, { - "x": 1241.2738095238096, + "x": 1409.4166666666667, "y": 2380 }, { - "x": 1241.2738095238096, + "x": 1409.4166666666667, "y": 2520 } ], @@ -5538,27 +5530,27 @@ "labelPercentage": 0, "route": [ { - "x": 1239.7738095238094, + "x": 1475.3333333333333, "y": 902 }, { - "x": 1239.7738095238094, + "x": 1475.3333333333333, "y": 1192 }, { - "x": 1327.4404761904761, + "x": 1585.5833333333333, "y": 1192 }, { - "x": 1327.4404761904761, + "x": 1585.5833333333333, "y": 1388 }, { - "x": 1315.7738095238096, + "x": 1558.9166666666667, "y": 1388 }, { - "x": 1315.7738095238096, + "x": 1558.9166666666667, "y": 1628 } ], @@ -5594,19 +5586,19 @@ "labelPercentage": 0, "route": [ { - "x": 1265.7738095238096, + "x": 1508.9166666666667, "y": 1694 }, { - "x": 1265.7738095238096, + "x": 1508.9166666666667, "y": 1884 }, { - "x": 1262.4404761904761, + "x": 1505.5833333333333, "y": 1884 }, { - "x": 1262.4404761904761, + "x": 1505.5833333333333, "y": 1974 } ], @@ -5642,19 +5634,19 @@ "labelPercentage": 0, "route": [ { - "x": 1295.7738095238096, + "x": 1538.9166666666665, "y": 2040 }, { - "x": 1295.7738095238096, + "x": 1538.9166666666665, "y": 2330 }, { - "x": 1209.2738095238096, + "x": 1377.4166666666667, "y": 2330 }, { - "x": 1209.2738095238096, + "x": 1377.4166666666667, "y": 2520 } ], @@ -5690,19 +5682,19 @@ "labelPercentage": 0, "route": [ { - "x": 438.4999999999999, + "x": 501.1666666666665, "y": 902 }, { - "x": 438.4999999999999, + "x": 501.1666666666665, "y": 2726 }, { - "x": 529.7738095238095, + "x": 594.3690476190477, "y": 2726 }, { - "x": 529.7738095238095, + "x": 594.3690476190477, "y": 3116 } ], @@ -5738,19 +5730,19 @@ "labelPercentage": 0, "route": [ { - "x": 1139.7619047619048, + "x": 1322.904761904762, "y": 1298 }, { - "x": 1139.7619047619048, + "x": 1322.904761904762, "y": 1538 }, { - "x": 1068.0238095238096, + "x": 1221.1666666666667, "y": 1538 }, { - "x": 1068.0238095238096, + "x": 1221.1666666666667, "y": 1628 } ], @@ -5786,19 +5778,19 @@ "labelPercentage": 0, "route": [ { - "x": 974.6904761904761, + "x": 1127.8333333333335, "y": 1694 }, { - "x": 974.6904761904761, + "x": 1127.8333333333335, "y": 1834 }, { - "x": 716.5, + "x": 819.1666666666667, "y": 1834 }, { - "x": 716.5, + "x": 819.1666666666667, "y": 2520 } ], @@ -5834,19 +5826,19 @@ "labelPercentage": 0, "route": [ { - "x": 749.8333333333333, + "x": 852.5, "y": 2586 }, { - "x": 749.8333333333333, + "x": 852.5, "y": 2976 }, { - "x": 669.7738095238095, + "x": 734.3690476190477, "y": 2976 }, { - "x": 669.7738095238095, + "x": 734.3690476190477, "y": 3116 } ], @@ -5882,19 +5874,19 @@ "labelPercentage": 0, "route": [ { - "x": 1264.107142857143, + "x": 1492.25, "y": 1298 }, { - "x": 1264.107142857143, + "x": 1492.25, "y": 1388 }, { - "x": 1275.7738095238096, + "x": 1518.9166666666667, "y": 1388 }, { - "x": 1275.7738095238096, + "x": 1518.9166666666667, "y": 1628 } ], @@ -5930,11 +5922,11 @@ "labelPercentage": 0, "route": [ { - "x": 1295.7738095238096, + "x": 1538.9166666666667, "y": 1694 }, { - "x": 1295.7738095238096, + "x": 1538.9166666666665, "y": 1974 } ], @@ -5970,27 +5962,27 @@ "labelPercentage": 0, "route": [ { - "x": 1195.7738095238096, + "x": 1438.9166666666665, "y": 2040 }, { - "x": 1195.7738095238096, + "x": 1438.9166666666665, "y": 2180 }, { - "x": 978.7738095238095, + "x": 1116.9166666666667, "y": 2180 }, { - "x": 978.7738095238095, + "x": 1116.9166666666667, "y": 3668 }, { - "x": 1254.7380952380952, + "x": 1480.857142857143, "y": 3668 }, { - "x": 1254.7380952380952, + "x": 1480.857142857143, "y": 3708 } ], @@ -6026,19 +6018,19 @@ "labelPercentage": 0, "route": [ { - "x": 1074.6904761904761, + "x": 1227.8333333333333, "y": 1694 }, { - "x": 1074.6904761904761, + "x": 1227.8333333333333, "y": 1734 }, { - "x": 1229.107142857143, + "x": 1472.25, "y": 1734 }, { - "x": 1229.107142857143, + "x": 1472.25, "y": 1974 } ], @@ -6074,27 +6066,27 @@ "labelPercentage": 0, "route": [ { - "x": 1229.107142857143, + "x": 1472.25, "y": 2040 }, { - "x": 1229.107142857143, + "x": 1472.25, "y": 2230 }, { - "x": 1001.4166666666666, + "x": 1139.5595238095239, "y": 2230 }, { - "x": 1001.4166666666666, + "x": 1139.5595238095239, "y": 3618 }, { - "x": 1289.0238095238094, + "x": 1515.142857142857, "y": 3618 }, { - "x": 1289.0238095238094, + "x": 1515.142857142857, "y": 3708 } ], @@ -6130,19 +6122,19 @@ "labelPercentage": 0, "route": [ { - "x": 1513.357142857143, + "x": 1784.6666666666665, "y": 1694 }, { - "x": 1513.357142857143, + "x": 1784.6666666666665, "y": 1734 }, { - "x": 1511.357142857143, + "x": 1782.6666666666665, "y": 1734 }, { - "x": 1511.357142857143, + "x": 1782.6666666666665, "y": 1974 } ], @@ -6178,19 +6170,19 @@ "labelPercentage": 0, "route": [ { - "x": 1481.357142857143, + "x": 1752.6666666666665, "y": 2040 }, { - "x": 1481.357142857143, + "x": 1752.6666666666665, "y": 2626 }, { - "x": 1422.2738095238096, + "x": 1650.4166666666667, "y": 2626 }, { - "x": 1422.2738095238096, + "x": 1650.4166666666667, "y": 3116 } ], @@ -6234,11 +6226,11 @@ "y": 3468 }, { - "x": 64.41666666666652, + "x": 72, "y": 3468 }, { - "x": 64.41666666666652, + "x": 72, "y": 3708 } ], @@ -6274,19 +6266,19 @@ "labelPercentage": 0, "route": [ { - "x": 218.66666666666674, + "x": 263.83333333333326, "y": 2040 }, { - "x": 218.66666666666674, + "x": 263.83333333333326, "y": 2080 }, { - "x": 190.33333333333326, + "x": 205.5, "y": 2080 }, { - "x": 190.33333333333326, + "x": 205.5, "y": 2520 } ], @@ -6322,19 +6314,19 @@ "labelPercentage": 0, "route": [ { - "x": 166.33333333333326, + "x": 181.5, "y": 2586 }, { - "x": 166.33333333333326, + "x": 181.5, "y": 2676 }, { - "x": 178.66666666666652, + "x": 223.83333333333326, "y": 2676 }, { - "x": 178.66666666666652, + "x": 223.83333333333326, "y": 3116 } ], @@ -6370,19 +6362,19 @@ "labelPercentage": 0, "route": [ { - "x": 1028.0238095238096, + "x": 1181.1666666666667, "y": 2040 }, { - "x": 1028.0238095238096, + "x": 1181.1666666666667, "y": 2130 }, { - "x": 783.1666666666666, + "x": 885.8333333333334, "y": 2130 }, { - "x": 783.1666666666666, + "x": 885.8333333333334, "y": 2520 } ], @@ -6418,19 +6410,27 @@ "labelPercentage": 0, "route": [ { - "x": 649.8333333333334, + "x": 752.5000000000001, "y": 2586 }, { - "x": 649.8333333333334, + "x": 752.5000000000001, "y": 2826 }, { - "x": 416.7738095238095, + "x": 452, "y": 2826 }, { - "x": 416.7738095238095, + "x": 452, + "y": 3272 + }, + { + "x": 451.3690476190475, + "y": 3272 + }, + { + "x": 451.3690476190475, "y": 3362 } ], @@ -6466,19 +6466,19 @@ "labelPercentage": 0, "route": [ { - "x": 198.33333333333326, + "x": 213.5, "y": 2586 }, { - "x": 198.33333333333326, + "x": 213.5, "y": 2626 }, { - "x": 212, + "x": 257.16666666666674, "y": 2626 }, { - "x": 212, + "x": 257.16666666666674, "y": 3116 } ], @@ -6514,19 +6514,19 @@ "labelPercentage": 0, "route": [ { - "x": 185.33333333333326, + "x": 230.5, "y": 3182 }, { - "x": 185.33333333333326, - "y": 3272 + "x": 230.5, + "y": 3222 }, { - "x": 154.91666666666652, - "y": 3272 + "x": 177.5, + "y": 3222 }, { - "x": 154.91666666666652, + "x": 177.5, "y": 3362 } ], @@ -6562,19 +6562,19 @@ "labelPercentage": 0, "route": [ { - "x": 144.91666666666652, + "x": 167.5, "y": 3428 }, { - "x": 144.91666666666652, + "x": 167.5, "y": 3518 }, { - "x": 124.41666666666652, + "x": 132, "y": 3518 }, { - "x": 124.41666666666652, + "x": 132, "y": 3708 } ], @@ -6610,11 +6610,11 @@ "labelPercentage": 0, "route": [ { - "x": 525.8333333333333, + "x": 618.5, "y": 2040 }, { - "x": 525.8333333333333, + "x": 618.5, "y": 2520 } ], @@ -6650,19 +6650,19 @@ "labelPercentage": 0, "route": [ { - "x": 525.8333333333333, + "x": 618.5, "y": 2586 }, { - "x": 525.8333333333333, + "x": 618.5, "y": 2626 }, { - "x": 599.7738095238095, + "x": 664.3690476190477, "y": 2626 }, { - "x": 599.7738095238095, + "x": 664.3690476190477, "y": 3116 } ], @@ -6698,19 +6698,19 @@ "labelPercentage": 0, "route": [ { - "x": 627.7738095238095, + "x": 692.3690476190477, "y": 3182 }, { - "x": 627.7738095238095, + "x": 692.3690476190477, "y": 3222 }, { - "x": 651.7738095238095, + "x": 716.3690476190476, "y": 3222 }, { - "x": 651.7738095238095, + "x": 716.3690476190476, "y": 3362 } ], @@ -6746,19 +6746,19 @@ "labelPercentage": 0, "route": [ { - "x": 1325.7738095238096, + "x": 1568.9166666666667, "y": 1694 }, { - "x": 1325.7738095238096, + "x": 1568.9166666666667, "y": 1884 }, { - "x": 1329.107142857143, + "x": 1572.25, "y": 1884 }, { - "x": 1329.107142857143, + "x": 1572.25, "y": 1974 } ], @@ -6794,19 +6794,27 @@ "labelPercentage": 0, "route": [ { - "x": 796.5, + "x": 929.1666666666667, "y": 1694 }, { - "x": 796.5, + "x": 929.1666666666667, "y": 1734 }, { - "x": 312, + "x": 368.1666666666665, "y": 1734 }, { - "x": 311.9999999999999, + "x": 368.1666666666665, + "y": 2676 + }, + { + "x": 357.1666666666665, + "y": 2676 + }, + { + "x": 357.1666666666665, "y": 3116 } ], @@ -6842,19 +6850,19 @@ "labelPercentage": 0, "route": [ { - "x": 225.33333333333326, + "x": 270.5, "y": 3182 }, { - "x": 225.33333333333326, + "x": 270.5, "y": 3518 }, { - "x": 503.2738095238095, + "x": 555.3690476190476, "y": 3518 }, { - "x": 503.2738095238095, + "x": 555.3690476190476, "y": 3708 } ], @@ -6890,19 +6898,19 @@ "labelPercentage": 0, "route": [ { - "x": 683.1666666666666, + "x": 785.8333333333334, "y": 2586 }, { - "x": 683.1666666666666, + "x": 785.8333333333334, "y": 2876 }, { - "x": 448.7738095238095, + "x": 483.3690476190475, "y": 2876 }, { - "x": 448.7738095238095, + "x": 483.3690476190475, "y": 3362 } ], @@ -6938,19 +6946,19 @@ "labelPercentage": 0, "route": [ { - "x": 1511.357142857143, + "x": 1782.6666666666665, "y": 2040 }, { - "x": 1511.357142857143, + "x": 1782.6666666666665, "y": 2080 }, { - "x": 1506.5238095238096, + "x": 1777.8333333333333, "y": 2080 }, { - "x": 1506.5238095238096, + "x": 1777.8333333333333, "y": 3362 } ], @@ -6986,27 +6994,27 @@ "labelPercentage": 0, "route": [ { - "x": 265.33333333333326, + "x": 310.5, "y": 3182 }, { - "x": 265.33333333333326, + "x": 310.5, "y": 3222 }, { - "x": 262, + "x": 307.16666666666674, "y": 3222 }, { - "x": 262, + "x": 307.16666666666674, "y": 3468 }, { - "x": 536.6071428571428, + "x": 588.7023809523808, "y": 3468 }, { - "x": 536.6071428571428, + "x": 588.7023809523808, "y": 3708 } ], @@ -7042,27 +7050,27 @@ "labelPercentage": 0, "route": [ { - "x": 1329.107142857143, + "x": 1572.25, "y": 2040 }, { - "x": 1329.107142857143, + "x": 1572.25, "y": 2430 }, { - "x": 1283.2738095238096, + "x": 1481.4166666666667, "y": 2430 }, { - "x": 1283.2738095238096, + "x": 1481.4166666666667, "y": 3568 }, { - "x": 1323.3095238095239, + "x": 1549.4285714285716, "y": 3568 }, { - "x": 1323.3095238095239, + "x": 1549.4285714285716, "y": 3708 } ], @@ -7098,11 +7106,11 @@ "labelPercentage": 0, "route": [ { - "x": 683.7738095238095, + "x": 748.3690476190477, "y": 3182 }, { - "x": 683.7738095238095, + "x": 748.3690476190476, "y": 3362 } ], @@ -7138,19 +7146,19 @@ "labelPercentage": 0, "route": [ { - "x": 1374.2738095238096, + "x": 1602.4166666666667, "y": 3182 }, { - "x": 1374.2738095238096, + "x": 1602.4166666666667, "y": 3468 }, { - "x": 1391.8809523809523, + "x": 1618, "y": 3468 }, { - "x": 1391.8809523809523, + "x": 1618, "y": 3708 } ], @@ -7186,19 +7194,19 @@ "labelPercentage": 0, "route": [ { - "x": 675.7738095238095, + "x": 740.3690476190476, "y": 3428 }, { - "x": 675.7738095238095, + "x": 740.3690476190476, "y": 3568 }, { - "x": 636.6071428571428, + "x": 688.7023809523808, "y": 3568 }, { - "x": 636.6071428571428, + "x": 688.7023809523808, "y": 3708 } ], diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 45132c938..936c4c0be 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-4079696995 .fill-N1{fill:#0A0F25;} + .d2-4079696995 .fill-N2{fill:#676C7E;} + .d2-4079696995 .fill-N3{fill:#9499AB;} + .d2-4079696995 .fill-N4{fill:#CFD2DD;} + .d2-4079696995 .fill-N5{fill:#DEE1EB;} + .d2-4079696995 .fill-N6{fill:#EEF1F8;} + .d2-4079696995 .fill-N7{fill:#FFFFFF;} + .d2-4079696995 .fill-B1{fill:#0D32B2;} + .d2-4079696995 .fill-B2{fill:#0D32B2;} + .d2-4079696995 .fill-B3{fill:#E3E9FD;} + .d2-4079696995 .fill-B4{fill:#E3E9FD;} + .d2-4079696995 .fill-B5{fill:#EDF0FD;} + .d2-4079696995 .fill-B6{fill:#F7F8FE;} + .d2-4079696995 .fill-AA2{fill:#4A6FF3;} + .d2-4079696995 .fill-AA4{fill:#EDF0FD;} + .d2-4079696995 .fill-AA5{fill:#F7F8FE;} + .d2-4079696995 .fill-AB4{fill:#EDF0FD;} + .d2-4079696995 .fill-AB5{fill:#F7F8FE;} + .d2-4079696995 .stroke-N1{stroke:#0A0F25;} + .d2-4079696995 .stroke-N2{stroke:#676C7E;} + .d2-4079696995 .stroke-N3{stroke:#9499AB;} + .d2-4079696995 .stroke-N4{stroke:#CFD2DD;} + .d2-4079696995 .stroke-N5{stroke:#DEE1EB;} + .d2-4079696995 .stroke-N6{stroke:#EEF1F8;} + .d2-4079696995 .stroke-N7{stroke:#FFFFFF;} + .d2-4079696995 .stroke-B1{stroke:#0D32B2;} + .d2-4079696995 .stroke-B2{stroke:#0D32B2;} + .d2-4079696995 .stroke-B3{stroke:#E3E9FD;} + .d2-4079696995 .stroke-B4{stroke:#E3E9FD;} + .d2-4079696995 .stroke-B5{stroke:#EDF0FD;} + .d2-4079696995 .stroke-B6{stroke:#F7F8FE;} + .d2-4079696995 .stroke-AA2{stroke:#4A6FF3;} + .d2-4079696995 .stroke-AA4{stroke:#EDF0FD;} + .d2-4079696995 .stroke-AA5{stroke:#F7F8FE;} + .d2-4079696995 .stroke-AB4{stroke:#EDF0FD;} + .d2-4079696995 .stroke-AB5{stroke:#F7F8FE;} + .d2-4079696995 .background-color-N1{background-color:#0A0F25;} + .d2-4079696995 .background-color-N2{background-color:#676C7E;} + .d2-4079696995 .background-color-N3{background-color:#9499AB;} + .d2-4079696995 .background-color-N4{background-color:#CFD2DD;} + .d2-4079696995 .background-color-N5{background-color:#DEE1EB;} + .d2-4079696995 .background-color-N6{background-color:#EEF1F8;} + .d2-4079696995 .background-color-N7{background-color:#FFFFFF;} + .d2-4079696995 .background-color-B1{background-color:#0D32B2;} + .d2-4079696995 .background-color-B2{background-color:#0D32B2;} + .d2-4079696995 .background-color-B3{background-color:#E3E9FD;} + .d2-4079696995 .background-color-B4{background-color:#E3E9FD;} + .d2-4079696995 .background-color-B5{background-color:#EDF0FD;} + .d2-4079696995 .background-color-B6{background-color:#F7F8FE;} + .d2-4079696995 .background-color-AA2{background-color:#4A6FF3;} + .d2-4079696995 .background-color-AA4{background-color:#EDF0FD;} + .d2-4079696995 .background-color-AA5{background-color:#F7F8FE;} + .d2-4079696995 .background-color-AB4{background-color:#EDF0FD;} + .d2-4079696995 .background-color-AB5{background-color:#F7F8FE;} + .d2-4079696995 .color-N1{color:#0A0F25;} + .d2-4079696995 .color-N2{color:#676C7E;} + .d2-4079696995 .color-N3{color:#9499AB;} + .d2-4079696995 .color-N4{color:#CFD2DD;} + .d2-4079696995 .color-N5{color:#DEE1EB;} + .d2-4079696995 .color-N6{color:#EEF1F8;} + .d2-4079696995 .color-N7{color:#FFFFFF;} + .d2-4079696995 .color-B1{color:#0D32B2;} + .d2-4079696995 .color-B2{color:#0D32B2;} + .d2-4079696995 .color-B3{color:#E3E9FD;} + .d2-4079696995 .color-B4{color:#E3E9FD;} + .d2-4079696995 .color-B5{color:#EDF0FD;} + .d2-4079696995 .color-B6{color:#F7F8FE;} + .d2-4079696995 .color-AA2{color:#4A6FF3;} + .d2-4079696995 .color-AA4{color:#EDF0FD;} + .d2-4079696995 .color-AA5{color:#F7F8FE;} + .d2-4079696995 .color-AB4{color:#EDF0FD;} + .d2-4079696995 .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