diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 8cc548605..69d056047 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -5,6 +5,7 @@ #### Improvements 🧹 - ELK self loops get distributed around the object instead of stacking [#1232](https://github.com/terrastruct/d2/pull/1232) +- ELK preserves order of objects in cycles [#1235](https://github.com/terrastruct/d2/pull/1235) #### Bugfixes ⛑️ diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index e6a42c762..c46ad5876 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -108,6 +108,7 @@ type elkOpts struct { InlineEdgeLabels bool `json:"elk.edgeLabels.inline,omitempty"` ForceNodeModelOrder bool `json:"elk.layered.crossingMinimization.forceNodeModelOrder,omitempty"` ConsiderModelOrder string `json:"elk.layered.considerModelOrder.strategy,omitempty"` + CycleBreakingStrategy string `json:"elk.layered.cycleBreaking.strategy,omitempty"` SelfLoopDistribution string `json:"elk.layered.edgeRouting.selfLoopDistribution,omitempty"` @@ -151,6 +152,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err HierarchyHandling: "INCLUDE_CHILDREN", FixedAlignment: "BALANCED", ConsiderModelOrder: "NODES_AND_EDGES", + CycleBreakingStrategy: "GREEDY_MODEL_ORDER", NodeSizeConstraints: "MINIMUM_SIZE", ContentAlignment: "H_CENTER V_CENTER", ConfigurableOpts: ConfigurableOpts{ @@ -236,6 +238,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err FixedAlignment: "BALANCED", EdgeNode: edge_node_spacing, ConsiderModelOrder: "NODES_AND_EDGES", + CycleBreakingStrategy: "GREEDY_MODEL_ORDER", NodeSizeConstraints: "MINIMUM_SIZE", ContentAlignment: "H_CENTER V_CENTER", ConfigurableOpts: ConfigurableOpts{ diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png index 71fb5d174..db64ce791 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png differ 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 ea37bcc83..f9cb8c74e 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/stable_test.go b/e2etests/stable_test.go index b92673360..91cc4a39f 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2468,6 +2468,90 @@ three-dee: { style.border-radius: 999 style.3d: true } +`, + }, + { + name: "cycle-order", + script: `direction: right +classes: { + group: { + style: { + fill: transparent + stroke-dash: 5 + } + } + icon: { + shape: image + height: 70 + width: 70 + } +} + +Plan -> Code -> Build -> Test -> Check -> Release -> Deploy -> Operate -> Monitor -> Plan + +Plan: { + class: group + ClickUp: { + class: icon + icon: https://avatars.githubusercontent.com/u/27873294?s=200&v=4 + } +} +Code: { + class: group + Git: { + class: icon + icon: https://icons.terrastruct.com/dev%2Fgit.svg + } +} +Build: { + class: group + Docker: { + class: icon + icon: https://icons.terrastruct.com/dev%2Fdocker.svg + } +} +Test: { + class: group + Playwright: { + class: icon + icon: https://playwright.dev/img/playwright-logo.svg + } +} +Check: { + class: group + TruffleHog: { + class: icon + icon: https://avatars.githubusercontent.com/u/79229934?s=200&v=4 + } +} +Release: { + class: group + Github Action: { + class: icon + icon: https://icons.terrastruct.com/dev%2Fgithub.svg + } +} +Deploy: { + class: group + "AWS Copilot": { + class: icon + icon: https://icons.terrastruct.com/aws%2FDeveloper%20Tools%2FAWS-CodeDeploy.svg + } +} +Operate: { + class: group + "AWS ECS": { + class: icon + icon: https://icons.terrastruct.com/aws%2FCompute%2FAWS-Fargate.svg + } +} +Monitor: { + class: group + Grafana: { + class: icon + icon: https://avatars.githubusercontent.com/u/7195757?s=200&v=4 + } +} `, }, { diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index dc633b86e..5186dc216 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": 701, - "height": 1835, + "width": 719, + "height": 1946, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -48,8 +48,8 @@ "id": "aa.bb", "type": "rectangle", "pos": { - "x": 62, - "y": 612 + "x": 100, + "y": 466 }, "width": 525, "height": 1090, @@ -89,8 +89,8 @@ "id": "aa.bb.cc", "type": "rectangle", "pos": { - "x": 203, - "y": 962 + "x": 241, + "y": 816 }, "width": 334, "height": 690, @@ -130,8 +130,8 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 253, - "y": 1012 + "x": 291, + "y": 866 }, "width": 193, "height": 166, @@ -171,8 +171,8 @@ "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 303, - "y": 1107 + "x": 341, + "y": 961 }, "width": 16, "height": 21, @@ -211,8 +211,8 @@ "id": "aa.bb.cc.dd.ff", "type": "rectangle", "pos": { - "x": 339, - "y": 1062 + "x": 377, + "y": 916 }, "width": 57, "height": 66, @@ -252,8 +252,8 @@ "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 358, - "y": 1354 + "x": 396, + "y": 1208 }, "width": 80, "height": 21, @@ -292,8 +292,8 @@ "id": "aa.bb.cc.hh", "type": "rectangle", "pos": { - "x": 367, - "y": 1536 + "x": 405, + "y": 1390 }, "width": 63, "height": 66, @@ -333,8 +333,8 @@ "id": "aa.bb.ii", "type": "package", "pos": { - "x": 112, - "y": 662 + "x": 150, + "y": 516 }, "width": 150, "height": 215, @@ -374,8 +374,8 @@ "id": "aa.bb.ii.jj", "type": "diamond", "pos": { - "x": 162, - "y": 735 + "x": 200, + "y": 589 }, "width": 50, "height": 92, @@ -415,8 +415,8 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 285, - "y": 732 + "x": 323, + "y": 586 }, "width": 74, "height": 74, @@ -456,8 +456,8 @@ "id": "aa.ll", "type": "rectangle", "pos": { - "x": 459, - "y": 310 + "x": 259, + "y": 1842 }, "width": 120, "height": 66, @@ -497,7 +497,7 @@ "id": "aa.mm", "type": "cylinder", "pos": { - "x": 287, + "x": 313, "y": 62 }, "width": 160, @@ -538,7 +538,7 @@ "id": "aa.nn", "type": "text", "pos": { - "x": 467, + "x": 493, "y": 110 }, "width": 16, @@ -578,7 +578,7 @@ "id": "aa.oo", "type": "rectangle", "pos": { - "x": 503, + "x": 529, "y": 88 }, "width": 63, @@ -642,20 +642,20 @@ "labelPercentage": 0, "route": [ { - "x": 311, - "y": 1128 + "x": 349, + "y": 982 }, { - "x": 311, - "y": 1314 + "x": 349, + "y": 1168 }, { - "x": 385.16666666666663, - "y": 1314 + "x": 423.16666666666663, + "y": 1168 }, { - "x": 385.16666666666663, - "y": 1354 + "x": 423.16666666666663, + "y": 1208 } ], "animated": false, @@ -688,12 +688,12 @@ "labelPercentage": 0, "route": [ { - "x": 398.5, - "y": 1375 + "x": 436.5, + "y": 1229 }, { - "x": 398.5, - "y": 1536 + "x": 436.5, + "y": 1390 } ], "animated": false, @@ -726,20 +726,20 @@ "labelPercentage": 0, "route": [ { - "x": 212, - "y": 877 + "x": 250, + "y": 731 }, { - "x": 212, - "y": 917 + "x": 250, + "y": 771 }, { - "x": 321, - "y": 917 + "x": 359, + "y": 771 }, { - "x": 321, - "y": 1012 + "x": 359, + "y": 866 } ], "animated": false, @@ -772,20 +772,28 @@ "labelPercentage": 0, "route": [ { - "x": 483.25, - "y": 376 + "x": 279.8333333333333, + "y": 1842 }, { - "x": 483.25, - "y": 416 + "x": 279.8333333333333, + "y": 1802 }, { - "x": 443.75, - "y": 416 + "x": 70.5, + "y": 1802 }, { - "x": 443.75, - "y": 612 + "x": 70.5, + "y": 421 + }, + { + "x": 215, + "y": 421 + }, + { + "x": 215, + "y": 466 } ], "animated": false, @@ -818,20 +826,20 @@ "labelPercentage": 0, "route": [ { - "x": 384, + "x": 409, "y": 180 }, { - "x": 383.75, - "y": 567 + "x": 409.125, + "y": 270 }, { - "x": 403.5, - "y": 567 + "x": 447.25, + "y": 270 }, { - "x": 403.5, - "y": 962 + "x": 447.25, + "y": 816 } ], "animated": false, @@ -864,20 +872,28 @@ "labelPercentage": 0, "route": [ { - "x": 416, + "x": 441, "y": 176 }, { - "x": 415.75, + "x": 441.125, "y": 220 }, { - "x": 519.25, + "x": 680.5, "y": 220 }, { - "x": 519.25, - "y": 310 + "x": 680.5, + "y": 1752 + }, + { + "x": 359.8333333333333, + "y": 1752 + }, + { + "x": 359.8333333333333, + "y": 1842 } ], "animated": false, @@ -910,12 +926,12 @@ "labelPercentage": 0, "route": [ { - "x": 352, + "x": 377, "y": 180 }, { - "x": 351.75, - "y": 612 + "x": 377.125, + "y": 466 } ], "animated": false, @@ -948,28 +964,36 @@ "labelPercentage": 0, "route": [ { - "x": 507.25, - "y": 376 + "x": 339.8333333333333, + "y": 1842 }, { - "x": 507.25, - "y": 567 + "x": 339.8333333333333, + "y": 1702 }, { - "x": 486, - "y": 567 + "x": 665, + "y": 1702 }, { - "x": 486, - "y": 1314 + "x": 665, + "y": 421 }, { - "x": 411.8333333333333, - "y": 1314 + "x": 524, + "y": 421 }, { - "x": 411.8333333333333, - "y": 1354 + "x": 524, + "y": 1168 + }, + { + "x": 449.8333333333333, + "y": 1168 + }, + { + "x": 449.8333333333333, + "y": 1208 } ], "animated": false, @@ -1002,20 +1026,20 @@ "labelPercentage": 0, "route": [ { - "x": 320, + "x": 345, "y": 176 }, { - "x": 319.75, - "y": 567 + "x": 345.125, + "y": 371 }, { - "x": 187, - "y": 567 + "x": 225, + "y": 371 }, { - "x": 187, - "y": 662 + "x": 225, + "y": 516 } ], "animated": false, @@ -1048,28 +1072,20 @@ "labelPercentage": 0, "route": [ { - "x": 342.8333333333333, - "y": 1652 + "x": 309.66666666666663, + "y": 1506 }, { - "x": 342.8333333333333, - "y": 1747 + "x": 309.66666666666663, + "y": 1702 }, { - "x": 627, - "y": 1747 + "x": 319.8333333333333, + "y": 1702 }, { - "x": 627, - "y": 466 - }, - { - "x": 531.25, - "y": 466 - }, - { - "x": 531.25, - "y": 376 + "x": 319.8333333333333, + "y": 1842 } ], "animated": false, @@ -1102,28 +1118,20 @@ "labelPercentage": 0, "route": [ { - "x": 162, - "y": 877 + "x": 200, + "y": 731 }, { - "x": 162, - "y": 1797 + "x": 200, + "y": 1752 }, { - "x": 654, - "y": 1797 + "x": 299.8333333333333, + "y": 1752 }, { - "x": 654, - "y": 416 - }, - { - "x": 555.25, - "y": 416 - }, - { - "x": 555.25, - "y": 376 + "x": 299.8333333333333, + "y": 1842 } ], "animated": false, diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 0e8370e03..e7165a09c 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/cycle-order/dagre/board.exp.json b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json new file mode 100644 index 000000000..860aaa8f7 --- /dev/null +++ b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json @@ -0,0 +1,1696 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "Plan", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 0, + "y": 41 + }, + "width": 170, + "height": 216, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Plan", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Code", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 270, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Code", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 59, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Build", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 540, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Build", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Test", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 810, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Test", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Check", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1080, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Check", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Release", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1350, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Release", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 88, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Deploy", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1620, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Deploy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 80, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Operate", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1890, + "y": 41 + }, + "width": 170, + "height": 117, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Operate", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Monitor", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 2160, + "y": 41 + }, + "width": 170, + "height": 216, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Monitor", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 91, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Plan.ClickUp", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 50, + "y": 111 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/27873294", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ClickUp", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 55, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Code.Git", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 320, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/git.svg", + "RawPath": "/dev%2Fgit.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Git", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 21, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Build.Docker", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 590, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/docker.svg", + "RawPath": "/dev%2Fdocker.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Docker", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Test.Playwright", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 860, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "playwright.dev", + "Path": "/img/playwright-logo.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Playwright", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Check.TruffleHog", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1130, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/79229934", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "TruffleHog", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Release.Github Action", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1400, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Github Action", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 97, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Deploy.AWS Copilot", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1670, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Developer Tools/AWS-CodeDeploy.svg", + "RawPath": "/aws%2FDeveloper%20Tools%2FAWS-CodeDeploy.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Copilot", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 87, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Operate.AWS ECS", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1940, + "y": 52 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Fargate.svg", + "RawPath": "/aws%2FCompute%2FAWS-Fargate.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS ECS", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 63, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Monitor.Grafana", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 2210, + "y": 111 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/7195757", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Grafana", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 57, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(Plan -> Code)[0]", + "src": "Plan", + "srcArrow": "none", + "dst": "Code", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 170, + "y": 80 + }, + { + "x": 210, + "y": 80 + }, + { + "x": 230, + "y": 80 + }, + { + "x": 270, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Code -> Build)[0]", + "src": "Code", + "srcArrow": "none", + "dst": "Build", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 440, + "y": 80 + }, + { + "x": 480, + "y": 80 + }, + { + "x": 500, + "y": 80 + }, + { + "x": 540, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Build -> Test)[0]", + "src": "Build", + "srcArrow": "none", + "dst": "Test", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 710, + "y": 80 + }, + { + "x": 750, + "y": 80 + }, + { + "x": 770, + "y": 80 + }, + { + "x": 810, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Test -> Check)[0]", + "src": "Test", + "srcArrow": "none", + "dst": "Check", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 980, + "y": 80 + }, + { + "x": 1020, + "y": 80 + }, + { + "x": 1040, + "y": 80 + }, + { + "x": 1080, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Check -> Release)[0]", + "src": "Check", + "srcArrow": "none", + "dst": "Release", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1250, + "y": 80 + }, + { + "x": 1290, + "y": 80 + }, + { + "x": 1310, + "y": 80 + }, + { + "x": 1350, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Release -> Deploy)[0]", + "src": "Release", + "srcArrow": "none", + "dst": "Deploy", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1520, + "y": 80 + }, + { + "x": 1560, + "y": 80 + }, + { + "x": 1580, + "y": 80 + }, + { + "x": 1620, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Deploy -> Operate)[0]", + "src": "Deploy", + "srcArrow": "none", + "dst": "Operate", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1790, + "y": 80 + }, + { + "x": 1830, + "y": 80 + }, + { + "x": 1850, + "y": 80 + }, + { + "x": 1890, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Operate -> Monitor)[0]", + "src": "Operate", + "srcArrow": "none", + "dst": "Monitor", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2060, + "y": 80 + }, + { + "x": 2100, + "y": 80 + }, + { + "x": 2120, + "y": 80 + }, + { + "x": 2160, + "y": 80 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Monitor -> Plan)[0]", + "src": "Monitor", + "srcArrow": "none", + "dst": "Plan", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2160, + "y": 198 + }, + { + "x": 2120, + "y": 198 + }, + { + "x": 2100, + "y": 198 + }, + { + "x": 2085, + "y": 198 + }, + { + "x": 2070, + "y": 198 + }, + { + "x": 2043, + "y": 198 + }, + { + "x": 2017.5, + "y": 198 + }, + { + "x": 1992, + "y": 198 + }, + { + "x": 1958, + "y": 198 + }, + { + "x": 1932.5, + "y": 198 + }, + { + "x": 1907, + "y": 198 + }, + { + "x": 1880, + "y": 198 + }, + { + "x": 1865, + "y": 198 + }, + { + "x": 1850, + "y": 198 + }, + { + "x": 1830, + "y": 198 + }, + { + "x": 1815, + "y": 198 + }, + { + "x": 1800, + "y": 198 + }, + { + "x": 1773, + "y": 198 + }, + { + "x": 1747.5, + "y": 198 + }, + { + "x": 1722, + "y": 198 + }, + { + "x": 1688, + "y": 198 + }, + { + "x": 1662.5, + "y": 198 + }, + { + "x": 1637, + "y": 198 + }, + { + "x": 1610, + "y": 198 + }, + { + "x": 1595, + "y": 198 + }, + { + "x": 1580, + "y": 198 + }, + { + "x": 1560, + "y": 198 + }, + { + "x": 1545, + "y": 198 + }, + { + "x": 1530, + "y": 198 + }, + { + "x": 1503, + "y": 198 + }, + { + "x": 1477.5, + "y": 198 + }, + { + "x": 1452, + "y": 198 + }, + { + "x": 1418, + "y": 198 + }, + { + "x": 1392.5, + "y": 198 + }, + { + "x": 1367, + "y": 198 + }, + { + "x": 1340, + "y": 198 + }, + { + "x": 1325, + "y": 198 + }, + { + "x": 1310, + "y": 198 + }, + { + "x": 1290, + "y": 198 + }, + { + "x": 1275, + "y": 198 + }, + { + "x": 1260, + "y": 198 + }, + { + "x": 1233, + "y": 198 + }, + { + "x": 1207.5, + "y": 198 + }, + { + "x": 1182, + "y": 198 + }, + { + "x": 1148, + "y": 198 + }, + { + "x": 1122.5, + "y": 198 + }, + { + "x": 1097, + "y": 198 + }, + { + "x": 1070, + "y": 198 + }, + { + "x": 1055, + "y": 198 + }, + { + "x": 1040, + "y": 198 + }, + { + "x": 1020, + "y": 198 + }, + { + "x": 1005, + "y": 198 + }, + { + "x": 990, + "y": 198 + }, + { + "x": 963, + "y": 198 + }, + { + "x": 937.5, + "y": 198 + }, + { + "x": 912, + "y": 198 + }, + { + "x": 878, + "y": 198 + }, + { + "x": 852.5, + "y": 198 + }, + { + "x": 827, + "y": 198 + }, + { + "x": 800, + "y": 198 + }, + { + "x": 785, + "y": 198 + }, + { + "x": 770, + "y": 198 + }, + { + "x": 750, + "y": 198 + }, + { + "x": 735, + "y": 198 + }, + { + "x": 720, + "y": 198 + }, + { + "x": 693, + "y": 198 + }, + { + "x": 667.5, + "y": 198 + }, + { + "x": 642, + "y": 198 + }, + { + "x": 608, + "y": 198 + }, + { + "x": 582.5, + "y": 198 + }, + { + "x": 557, + "y": 198 + }, + { + "x": 530, + "y": 198 + }, + { + "x": 515, + "y": 198 + }, + { + "x": 500, + "y": 198 + }, + { + "x": 480, + "y": 198 + }, + { + "x": 465, + "y": 198 + }, + { + "x": 450, + "y": 198 + }, + { + "x": 423, + "y": 198 + }, + { + "x": 397.5, + "y": 198 + }, + { + "x": 372, + "y": 198 + }, + { + "x": 338, + "y": 198 + }, + { + "x": 312.5, + "y": 198 + }, + { + "x": 287, + "y": 198 + }, + { + "x": 210, + "y": 198 + }, + { + "x": 170, + "y": 198 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg new file mode 100644 index 000000000..061c6c541 --- /dev/null +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/elk/board.exp.json b/e2etests/testdata/stable/cycle-order/elk/board.exp.json new file mode 100644 index 000000000..719355952 --- /dev/null +++ b/e2etests/testdata/stable/cycle-order/elk/board.exp.json @@ -0,0 +1,1291 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "Plan", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 12, + "y": 80 + }, + "width": 170, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Plan", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Code", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 262, + "y": 12 + }, + "width": 170, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Code", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 59, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Build", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 502, + "y": 12 + }, + "width": 170, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Build", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Test", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 742, + "y": 12 + }, + "width": 177, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Test", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Check", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 989, + "y": 12 + }, + "width": 177, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Check", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Release", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1236, + "y": 12 + }, + "width": 197, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Release", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 88, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Deploy", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1503, + "y": 12 + }, + "width": 187, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Deploy", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 80, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Operate", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 1760, + "y": 12 + }, + "width": 170, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Operate", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Monitor", + "type": "rectangle", + "classes": [ + "group" + ], + "pos": { + "x": 2010, + "y": 80 + }, + "width": 170, + "height": 196, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Monitor", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 91, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Plan.ClickUp", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 62, + "y": 131 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/27873294", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ClickUp", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 55, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Code.Git", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 312, + "y": 62 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/git.svg", + "RawPath": "/dev%2Fgit.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Git", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 21, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Build.Docker", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 552, + "y": 62 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/docker.svg", + "RawPath": "/dev%2Fdocker.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Docker", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Test.Playwright", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 792, + "y": 62 + }, + "width": 77, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "playwright.dev", + "Path": "/img/playwright-logo.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Playwright", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Check.TruffleHog", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1039, + "y": 62 + }, + "width": 77, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/79229934", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "TruffleHog", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Release.Github Action", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1286, + "y": 62 + }, + "width": 97, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/dev/github.svg", + "RawPath": "/dev%2Fgithub.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Github Action", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 97, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Deploy.AWS Copilot", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1553, + "y": 62 + }, + "width": 87, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Developer Tools/AWS-CodeDeploy.svg", + "RawPath": "/aws%2FDeveloper%20Tools%2FAWS-CodeDeploy.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Copilot", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 87, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Operate.AWS ECS", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 1810, + "y": 62 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Fargate.svg", + "RawPath": "/aws%2FCompute%2FAWS-Fargate.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS ECS", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 63, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "Monitor.Grafana", + "type": "image", + "classes": [ + "icon" + ], + "pos": { + "x": 2060, + "y": 131 + }, + "width": 70, + "height": 70, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "avatars.githubusercontent.com", + "Path": "/u/7195757", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "s=200&v=4", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Grafana", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 57, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(Plan -> Code)[0]", + "src": "Plan", + "srcArrow": "none", + "dst": "Code", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 182, + "y": 110 + }, + { + "x": 262, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Code -> Build)[0]", + "src": "Code", + "srcArrow": "none", + "dst": "Build", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 432, + "y": 110 + }, + { + "x": 502, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Build -> Test)[0]", + "src": "Build", + "srcArrow": "none", + "dst": "Test", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 672, + "y": 110 + }, + { + "x": 742, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Test -> Check)[0]", + "src": "Test", + "srcArrow": "none", + "dst": "Check", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 919, + "y": 110 + }, + { + "x": 989, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Check -> Release)[0]", + "src": "Check", + "srcArrow": "none", + "dst": "Release", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1166, + "y": 110 + }, + { + "x": 1236, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Release -> Deploy)[0]", + "src": "Release", + "srcArrow": "none", + "dst": "Deploy", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1433, + "y": 110 + }, + { + "x": 1503, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Deploy -> Operate)[0]", + "src": "Deploy", + "srcArrow": "none", + "dst": "Operate", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1690, + "y": 110 + }, + { + "x": 1760, + "y": 110 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Operate -> Monitor)[0]", + "src": "Operate", + "srcArrow": "none", + "dst": "Monitor", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1930, + "y": 146.33333333333331 + }, + { + "x": 2010, + "y": 146.33333333333331 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(Monitor -> Plan)[0]", + "src": "Monitor", + "srcArrow": "none", + "dst": "Plan", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 2010, + "y": 248 + }, + { + "x": 182, + "y": 248 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg new file mode 100644 index 000000000..d396077cd --- /dev/null +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + + + \ 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 a14339bf8..1d439d71c 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 155, + "x": 167, "y": 158 }, "width": 53, @@ -48,7 +48,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 40, + "x": 52, "y": 304 }, "width": 280, @@ -89,7 +89,7 @@ "id": "c", "type": "rectangle", "pos": { - "x": 82, + "x": 94, "y": 158 }, "width": 53, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 362, - "y": 500 + "x": 369, + "y": 550 }, "width": 120, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 384, - "y": 942 + "x": 439, + "y": 1092 }, "width": 120, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 139, - "y": 696 + "x": 221, + "y": 796 }, "width": 80, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 187, - "y": 500 + "x": 268, + "y": 550 }, "width": 54, "height": 66, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 53, - "y": 500 + "x": 86, + "y": 550 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 79, - "y": 1088 + "x": 213, + "y": 1238 }, "width": 80, "height": 66, @@ -376,7 +376,7 @@ "id": "j", "type": "rectangle", "pos": { - "x": 141, + "x": 153, "y": 12 }, "width": 80, @@ -417,8 +417,8 @@ "id": "k", "type": "rectangle", "pos": { - "x": 92, - "y": 1224 + "x": 226, + "y": 1374 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "l", "type": "rectangle", "pos": { - "x": 511, - "y": 696 + "x": 569, + "y": 796 }, "width": 120, "height": 66, @@ -499,8 +499,8 @@ "id": "m", "type": "rectangle", "pos": { - "x": 261, - "y": 500 + "x": 517, + "y": 550 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "n", "type": "rectangle", "pos": { - "x": 197, - "y": 942 + "x": 299, + "y": 1092 }, "width": 120, "height": 66, @@ -581,8 +581,8 @@ "id": "o", "type": "rectangle", "pos": { - "x": 502, - "y": 500 + "x": 12, + "y": 550 }, "width": 54, "height": 66, @@ -622,8 +622,8 @@ "id": "p", "type": "rectangle", "pos": { - "x": 576, - "y": 500 + "x": 632, + "y": 550 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 417, - "y": 1088 + "x": 472, + "y": 1238 }, "width": 54, "height": 66, @@ -727,11 +727,11 @@ "labelPercentage": 0, "route": [ { - "x": 180, + "x": 192.16666666666669, "y": 224 }, { - "x": 180, + "x": 192.16666666666669, "y": 304 } ], @@ -765,11 +765,11 @@ "labelPercentage": 0, "route": [ { - "x": 110, + "x": 122.16666666666669, "y": 224 }, { - "x": 110, + "x": 122.16666666666669, "y": 304 } ], @@ -803,20 +803,20 @@ "labelPercentage": 0, "route": [ { - "x": 421, - "y": 566 + "x": 439.5, + "y": 616 }, { - "x": 421, - "y": 802 + "x": 439.5, + "y": 952 }, { - "x": 444.3333333333333, - "y": 802 + "x": 499.3333333333333, + "y": 952 }, { - "x": 444.3333333333333, - "y": 942 + "x": 499.3333333333333, + "y": 1092 } ], "animated": false, @@ -849,20 +849,20 @@ "labelPercentage": 0, "route": [ { - "x": 192.66666666666657, - "y": 762 + "x": 275.00000000000006, + "y": 862 }, { - "x": 192.66666666666657, - "y": 852 + "x": 275.00000000000006, + "y": 1002 }, { - "x": 414.3333333333333, - "y": 852 + "x": 469.3333333333333, + "y": 1002 }, { - "x": 414.3333333333333, - "y": 942 + "x": 469.3333333333333, + "y": 1092 } ], "animated": false, @@ -895,20 +895,20 @@ "labelPercentage": 0, "route": [ { - "x": 146, + "x": 227.66666666666669, "y": 370 }, { - "x": 146, - "y": 606 + "x": 227.66666666666669, + "y": 656 }, { - "x": 165.99999999999994, - "y": 606 + "x": 248.33333333333343, + "y": 656 }, { - "x": 165.99999999999994, - "y": 696 + "x": 248.33333333333343, + "y": 796 } ], "animated": false, @@ -941,12 +941,20 @@ "labelPercentage": 0, "route": [ { - "x": 214, + "x": 252.16666666666669, "y": 370 }, { - "x": 214, - "y": 500 + "x": 252.16666666666669, + "y": 460 + }, + { + "x": 295.6666666666667, + "y": 460 + }, + { + "x": 295.6666666666667, + "y": 550 } ], "animated": false, @@ -979,20 +987,20 @@ "labelPercentage": 0, "route": [ { - "x": 214, - "y": 566 + "x": 295.6666666666667, + "y": 616 }, { - "x": 214, - "y": 606 + "x": 295.6666666666667, + "y": 656 }, { - "x": 192.66666666666657, - "y": 606 + "x": 275.00000000000006, + "y": 656 }, { - "x": 192.66666666666657, - "y": 696 + "x": 275.00000000000006, + "y": 796 } ], "animated": false, @@ -1025,20 +1033,12 @@ "labelPercentage": 0, "route": [ { - "x": 120, + "x": 112.5, "y": 370 }, { - "x": 120, - "y": 460 - }, - { - "x": 79.5, - "y": 460 - }, - { - "x": 79.5, - "y": 500 + "x": 112.5, + "y": 550 } ], "animated": false, @@ -1071,28 +1071,20 @@ "labelPercentage": 0, "route": [ { - "x": 80, + "x": 179, "y": 370 }, { - "x": 80, - "y": 410 + "x": 179, + "y": 1198 }, { - "x": 12, - "y": 410 + "x": 239.66666666666669, + "y": 1198 }, { - "x": 12, - "y": 1048 - }, - { - "x": 106.08333333333331, - "y": 1048 - }, - { - "x": 106.08333333333331, - "y": 1088 + "x": 239.66666666666669, + "y": 1238 } ], "animated": false, @@ -1125,20 +1117,20 @@ "labelPercentage": 0, "route": [ { - "x": 240, + "x": 292.1666666666667, "y": 370 }, { - "x": 240, - "y": 460 + "x": 292.1666666666667, + "y": 410 }, { - "x": 422.75, - "y": 460 + "x": 429.8333333333333, + "y": 410 }, { - "x": 422.75, - "y": 500 + "x": 429.8333333333333, + "y": 550 } ], "animated": false, @@ -1171,19 +1163,19 @@ "labelPercentage": 0, "route": [ { - "x": 161.5, + "x": 173.66666666666669, "y": 78 }, { - "x": 161.5, + "x": 173.66666666666669, "y": 118 }, { - "x": 108.5, + "x": 120.66666666666669, "y": 118 }, { - "x": 108.5, + "x": 120.66666666666669, "y": 158 } ], @@ -1217,11 +1209,11 @@ "labelPercentage": 0, "route": [ { - "x": 181.5, + "x": 193.66666666666669, "y": 78 }, { - "x": 181.5, + "x": 193.66666666666669, "y": 158 } ], @@ -1255,19 +1247,19 @@ "labelPercentage": 0, "route": [ { - "x": 250, + "x": 262.1666666666667, "y": 304 }, { - "x": 249.99999999999997, + "x": 262.1666666666667, "y": 118 }, { - "x": 201.5, + "x": 213.66666666666669, "y": 118 }, { - "x": 201.5, + "x": 213.66666666666669, "y": 78 } ], @@ -1301,12 +1293,12 @@ "labelPercentage": 0, "route": [ { - "x": 119.41666666666663, - "y": 1154 + "x": 253, + "y": 1304 }, { - "x": 119.41666666666663, - "y": 1224 + "x": 253, + "y": 1374 } ], "animated": false, @@ -1339,20 +1331,20 @@ "labelPercentage": 0, "route": [ { - "x": 452.75, - "y": 566 + "x": 459.8333333333333, + "y": 616 }, { - "x": 452.75, - "y": 606 + "x": 459.8333333333333, + "y": 706 }, { - "x": 571.5, - "y": 606 + "x": 599.8333333333333, + "y": 706 }, { - "x": 571.5, - "y": 696 + "x": 599.8333333333333, + "y": 796 } ], "animated": false, @@ -1385,20 +1377,20 @@ "labelPercentage": 0, "route": [ { - "x": 571.5, - "y": 762 + "x": 629.8333333333333, + "y": 862 }, { - "x": 571.5, - "y": 802 + "x": 629.8333333333333, + "y": 952 }, { - "x": 474.3333333333333, - "y": 802 + "x": 529.3333333333333, + "y": 952 }, { - "x": 474.3333333333333, - "y": 942 + "x": 529.3333333333333, + "y": 1092 } ], "animated": false, @@ -1431,20 +1423,20 @@ "labelPercentage": 0, "route": [ { - "x": 314.3333333333333, - "y": 566 + "x": 570.3333333333333, + "y": 616 }, { - "x": 314.3333333333333, + "x": 570.3333333333333, "y": 656 }, { - "x": 541.5, + "x": 629.8333333333333, "y": 656 }, { - "x": 541.5, - "y": 696 + "x": 629.8333333333333, + "y": 796 } ], "animated": false, @@ -1477,20 +1469,20 @@ "labelPercentage": 0, "route": [ { - "x": 287.66666666666663, - "y": 566 + "x": 543.6666666666666, + "y": 616 }, { - "x": 287.66666666666663, - "y": 802 + "x": 543.6666666666666, + "y": 756 }, { - "x": 257.25, - "y": 802 + "x": 389.3333333333333, + "y": 756 }, { - "x": 257.25, - "y": 942 + "x": 389.3333333333333, + "y": 1092 } ], "animated": false, @@ -1523,20 +1515,20 @@ "labelPercentage": 0, "route": [ { - "x": 257.25, - "y": 1008 + "x": 359.3333333333333, + "y": 1158 }, { - "x": 257.25, - "y": 1048 + "x": 359.3333333333333, + "y": 1198 }, { - "x": 132.74999999999994, - "y": 1048 + "x": 266.3333333333333, + "y": 1198 }, { - "x": 132.74999999999994, - "y": 1088 + "x": 266.3333333333333, + "y": 1238 } ], "animated": false, @@ -1569,20 +1561,20 @@ "labelPercentage": 0, "route": [ { - "x": 392.75, - "y": 566 + "x": 399.8333333333333, + "y": 616 }, { - "x": 392.75, - "y": 902 + "x": 399.8333333333333, + "y": 656 }, { - "x": 287.25, - "y": 902 + "x": 356.33333333333337, + "y": 656 }, { - "x": 287.25, - "y": 942 + "x": 356.33333333333337, + "y": 1092 } ], "animated": false, @@ -1615,20 +1607,20 @@ "labelPercentage": 0, "route": [ { - "x": 165.99999999999994, - "y": 762 + "x": 248.33333333333343, + "y": 862 }, { - "x": 165.99999999999994, - "y": 902 + "x": 248.33333333333343, + "y": 1052 }, { - "x": 227.25, - "y": 902 + "x": 329.3333333333333, + "y": 1052 }, { - "x": 227.25, - "y": 942 + "x": 329.3333333333333, + "y": 1092 } ], "animated": false, @@ -1661,20 +1653,20 @@ "labelPercentage": 0, "route": [ { - "x": 280, + "x": 92.16666666666669, "y": 370 }, { - "x": 280, + "x": 92.16666666666669, "y": 410 }, { - "x": 529.75, + "x": 39, "y": 410 }, { - "x": 529.75, - "y": 500 + "x": 39, + "y": 550 } ], "animated": false, @@ -1707,12 +1699,12 @@ "labelPercentage": 0, "route": [ { - "x": 601.5, - "y": 566 + "x": 659.8333333333333, + "y": 616 }, { - "x": 601.5, - "y": 696 + "x": 659.8333333333333, + "y": 796 } ], "animated": false, @@ -1745,12 +1737,12 @@ "labelPercentage": 0, "route": [ { - "x": 444.3333333333333, - "y": 1008 + "x": 499.3333333333333, + "y": 1158 }, { - "x": 444.3333333333333, - "y": 1088 + "x": 499.3333333333333, + "y": 1238 } ], "animated": false, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 9b6112c21..965c9981d 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-3612039324 .fill-N1{fill:#0A0F25;} + .d2-3612039324 .fill-N2{fill:#676C7E;} + .d2-3612039324 .fill-N3{fill:#9499AB;} + .d2-3612039324 .fill-N4{fill:#CFD2DD;} + .d2-3612039324 .fill-N5{fill:#DEE1EB;} + .d2-3612039324 .fill-N6{fill:#EEF1F8;} + .d2-3612039324 .fill-N7{fill:#FFFFFF;} + .d2-3612039324 .fill-B1{fill:#0D32B2;} + .d2-3612039324 .fill-B2{fill:#0D32B2;} + .d2-3612039324 .fill-B3{fill:#E3E9FD;} + .d2-3612039324 .fill-B4{fill:#E3E9FD;} + .d2-3612039324 .fill-B5{fill:#EDF0FD;} + .d2-3612039324 .fill-B6{fill:#F7F8FE;} + .d2-3612039324 .fill-AA2{fill:#4A6FF3;} + .d2-3612039324 .fill-AA4{fill:#EDF0FD;} + .d2-3612039324 .fill-AA5{fill:#F7F8FE;} + .d2-3612039324 .fill-AB4{fill:#EDF0FD;} + .d2-3612039324 .fill-AB5{fill:#F7F8FE;} + .d2-3612039324 .stroke-N1{stroke:#0A0F25;} + .d2-3612039324 .stroke-N2{stroke:#676C7E;} + .d2-3612039324 .stroke-N3{stroke:#9499AB;} + .d2-3612039324 .stroke-N4{stroke:#CFD2DD;} + .d2-3612039324 .stroke-N5{stroke:#DEE1EB;} + .d2-3612039324 .stroke-N6{stroke:#EEF1F8;} + .d2-3612039324 .stroke-N7{stroke:#FFFFFF;} + .d2-3612039324 .stroke-B1{stroke:#0D32B2;} + .d2-3612039324 .stroke-B2{stroke:#0D32B2;} + .d2-3612039324 .stroke-B3{stroke:#E3E9FD;} + .d2-3612039324 .stroke-B4{stroke:#E3E9FD;} + .d2-3612039324 .stroke-B5{stroke:#EDF0FD;} + .d2-3612039324 .stroke-B6{stroke:#F7F8FE;} + .d2-3612039324 .stroke-AA2{stroke:#4A6FF3;} + .d2-3612039324 .stroke-AA4{stroke:#EDF0FD;} + .d2-3612039324 .stroke-AA5{stroke:#F7F8FE;} + .d2-3612039324 .stroke-AB4{stroke:#EDF0FD;} + .d2-3612039324 .stroke-AB5{stroke:#F7F8FE;} + .d2-3612039324 .background-color-N1{background-color:#0A0F25;} + .d2-3612039324 .background-color-N2{background-color:#676C7E;} + .d2-3612039324 .background-color-N3{background-color:#9499AB;} + .d2-3612039324 .background-color-N4{background-color:#CFD2DD;} + .d2-3612039324 .background-color-N5{background-color:#DEE1EB;} + .d2-3612039324 .background-color-N6{background-color:#EEF1F8;} + .d2-3612039324 .background-color-N7{background-color:#FFFFFF;} + .d2-3612039324 .background-color-B1{background-color:#0D32B2;} + .d2-3612039324 .background-color-B2{background-color:#0D32B2;} + .d2-3612039324 .background-color-B3{background-color:#E3E9FD;} + .d2-3612039324 .background-color-B4{background-color:#E3E9FD;} + .d2-3612039324 .background-color-B5{background-color:#EDF0FD;} + .d2-3612039324 .background-color-B6{background-color:#F7F8FE;} + .d2-3612039324 .background-color-AA2{background-color:#4A6FF3;} + .d2-3612039324 .background-color-AA4{background-color:#EDF0FD;} + .d2-3612039324 .background-color-AA5{background-color:#F7F8FE;} + .d2-3612039324 .background-color-AB4{background-color:#EDF0FD;} + .d2-3612039324 .background-color-AB5{background-color:#F7F8FE;} + .d2-3612039324 .color-N1{color:#0A0F25;} + .d2-3612039324 .color-N2{color:#676C7E;} + .d2-3612039324 .color-N3{color:#9499AB;} + .d2-3612039324 .color-N4{color:#CFD2DD;} + .d2-3612039324 .color-N5{color:#DEE1EB;} + .d2-3612039324 .color-N6{color:#EEF1F8;} + .d2-3612039324 .color-N7{color:#FFFFFF;} + .d2-3612039324 .color-B1{color:#0D32B2;} + .d2-3612039324 .color-B2{color:#0D32B2;} + .d2-3612039324 .color-B3{color:#E3E9FD;} + .d2-3612039324 .color-B4{color:#E3E9FD;} + .d2-3612039324 .color-B5{color:#EDF0FD;} + .d2-3612039324 .color-B6{color:#F7F8FE;} + .d2-3612039324 .color-AA2{color:#4A6FF3;} + .d2-3612039324 .color-AA4{color:#EDF0FD;} + .d2-3612039324 .color-AA5{color:#F7F8FE;} + .d2-3612039324 .color-AB4{color:#EDF0FD;} + .d2-3612039324 .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/elk_shim/elk/board.exp.json b/e2etests/testdata/stable/elk_shim/elk/board.exp.json index 4af1f5124..381f7aad8 100644 --- a/e2etests/testdata/stable/elk_shim/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/elk/board.exp.json @@ -335,7 +335,7 @@ "id": "user", "type": "person", "pos": { - "x": 317, + "x": 206, "y": 12 }, "width": 130, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 597, - "y": 59 + "x": 337, + "y": 1358 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 695, - "y": 311 + "x": 359, + "y": 1585 }, "width": 73, "height": 87, @@ -633,19 +633,19 @@ "labelPercentage": 0, "route": [ { - "x": 361, + "x": 249, "y": 99 }, { - "x": 360.83333333333337, + "x": 249.41666666666669, "y": 165 }, { - "x": 238.58333333333334, + "x": 118.83333333333331, "y": 165 }, { - "x": 238.58333333333334, + "x": 118.83333333333331, "y": 361 } ], @@ -679,12 +679,20 @@ "labelPercentage": 0, "route": [ { - "x": 430, + "x": 293, "y": 99 }, { - "x": 430, - "y": 416 + "x": 292.75, + "y": 165 + }, + { + "x": 423.33333333333337, + "y": 165 + }, + { + "x": 423, + "y": 417 } ], "animated": false, @@ -717,11 +725,19 @@ "labelPercentage": 0, "route": [ { - "x": 626, - "y": 125 + "x": 415.0833333333333, + "y": 1358 }, { - "x": 626, + "x": 415.0833333333333, + "y": 1318 + }, + { + "x": 659, + "y": 1318 + }, + { + "x": 659, "y": 266 }, { @@ -763,20 +779,12 @@ "labelPercentage": 0, "route": [ { - "x": 684, - "y": 125 + "x": 395.75, + "y": 1424 }, { - "x": 684, - "y": 165 - }, - { - "x": 731.5, - "y": 165 - }, - { - "x": 732, - "y": 311 + "x": 396, + "y": 1585 } ], "animated": false, @@ -814,15 +822,15 @@ }, { "x": 132.5, - "y": 1248 + "y": 1318 }, { - "x": 655, - "y": 1248 + "x": 376.4166666666667, + "y": 1318 }, { - "x": 655, - "y": 125 + "x": 376.4166666666667, + "y": 1358 } ], "animated": false, diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index e5e39901b..bf81e234b 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - + .d2-2437732080 .fill-N1{fill:#0A0F25;} + .d2-2437732080 .fill-N2{fill:#676C7E;} + .d2-2437732080 .fill-N3{fill:#9499AB;} + .d2-2437732080 .fill-N4{fill:#CFD2DD;} + .d2-2437732080 .fill-N5{fill:#DEE1EB;} + .d2-2437732080 .fill-N6{fill:#EEF1F8;} + .d2-2437732080 .fill-N7{fill:#FFFFFF;} + .d2-2437732080 .fill-B1{fill:#0D32B2;} + .d2-2437732080 .fill-B2{fill:#0D32B2;} + .d2-2437732080 .fill-B3{fill:#E3E9FD;} + .d2-2437732080 .fill-B4{fill:#E3E9FD;} + .d2-2437732080 .fill-B5{fill:#EDF0FD;} + .d2-2437732080 .fill-B6{fill:#F7F8FE;} + .d2-2437732080 .fill-AA2{fill:#4A6FF3;} + .d2-2437732080 .fill-AA4{fill:#EDF0FD;} + .d2-2437732080 .fill-AA5{fill:#F7F8FE;} + .d2-2437732080 .fill-AB4{fill:#EDF0FD;} + .d2-2437732080 .fill-AB5{fill:#F7F8FE;} + .d2-2437732080 .stroke-N1{stroke:#0A0F25;} + .d2-2437732080 .stroke-N2{stroke:#676C7E;} + .d2-2437732080 .stroke-N3{stroke:#9499AB;} + .d2-2437732080 .stroke-N4{stroke:#CFD2DD;} + .d2-2437732080 .stroke-N5{stroke:#DEE1EB;} + .d2-2437732080 .stroke-N6{stroke:#EEF1F8;} + .d2-2437732080 .stroke-N7{stroke:#FFFFFF;} + .d2-2437732080 .stroke-B1{stroke:#0D32B2;} + .d2-2437732080 .stroke-B2{stroke:#0D32B2;} + .d2-2437732080 .stroke-B3{stroke:#E3E9FD;} + .d2-2437732080 .stroke-B4{stroke:#E3E9FD;} + .d2-2437732080 .stroke-B5{stroke:#EDF0FD;} + .d2-2437732080 .stroke-B6{stroke:#F7F8FE;} + .d2-2437732080 .stroke-AA2{stroke:#4A6FF3;} + .d2-2437732080 .stroke-AA4{stroke:#EDF0FD;} + .d2-2437732080 .stroke-AA5{stroke:#F7F8FE;} + .d2-2437732080 .stroke-AB4{stroke:#EDF0FD;} + .d2-2437732080 .stroke-AB5{stroke:#F7F8FE;} + .d2-2437732080 .background-color-N1{background-color:#0A0F25;} + .d2-2437732080 .background-color-N2{background-color:#676C7E;} + .d2-2437732080 .background-color-N3{background-color:#9499AB;} + .d2-2437732080 .background-color-N4{background-color:#CFD2DD;} + .d2-2437732080 .background-color-N5{background-color:#DEE1EB;} + .d2-2437732080 .background-color-N6{background-color:#EEF1F8;} + .d2-2437732080 .background-color-N7{background-color:#FFFFFF;} + .d2-2437732080 .background-color-B1{background-color:#0D32B2;} + .d2-2437732080 .background-color-B2{background-color:#0D32B2;} + .d2-2437732080 .background-color-B3{background-color:#E3E9FD;} + .d2-2437732080 .background-color-B4{background-color:#E3E9FD;} + .d2-2437732080 .background-color-B5{background-color:#EDF0FD;} + .d2-2437732080 .background-color-B6{background-color:#F7F8FE;} + .d2-2437732080 .background-color-AA2{background-color:#4A6FF3;} + .d2-2437732080 .background-color-AA4{background-color:#EDF0FD;} + .d2-2437732080 .background-color-AA5{background-color:#F7F8FE;} + .d2-2437732080 .background-color-AB4{background-color:#EDF0FD;} + .d2-2437732080 .background-color-AB5{background-color:#F7F8FE;} + .d2-2437732080 .color-N1{color:#0A0F25;} + .d2-2437732080 .color-N2{color:#676C7E;} + .d2-2437732080 .color-N3{color:#9499AB;} + .d2-2437732080 .color-N4{color:#CFD2DD;} + .d2-2437732080 .color-N5{color:#DEE1EB;} + .d2-2437732080 .color-N6{color:#EEF1F8;} + .d2-2437732080 .color-N7{color:#FFFFFF;} + .d2-2437732080 .color-B1{color:#0D32B2;} + .d2-2437732080 .color-B2{color:#0D32B2;} + .d2-2437732080 .color-B3{color:#E3E9FD;} + .d2-2437732080 .color-B4{color:#E3E9FD;} + .d2-2437732080 .color-B5{color:#EDF0FD;} + .d2-2437732080 .color-B6{color:#F7F8FE;} + .d2-2437732080 .color-AA2{color:#4A6FF3;} + .d2-2437732080 .color-AA4{color:#EDF0FD;} + .d2-2437732080 .color-AA5{color:#F7F8FE;} + .d2-2437732080 .color-AB4{color:#EDF0FD;} + .d2-2437732080 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + - - - - + + + + \ 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 12b4d6e6f..be693bc3c 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 12, + "x": 85, "y": 436 }, "width": 53, @@ -48,7 +48,7 @@ "id": "b", "type": "rectangle", "pos": { - "x": 911, + "x": 12, "y": 436 }, "width": 53, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 417, - "y": 1718 + "x": 619, + "y": 1768 }, "width": 53, "height": 66, @@ -130,8 +130,8 @@ "id": "d", "type": "rectangle", "pos": { - "x": 490, - "y": 1718 + "x": 545, + "y": 1768 }, "width": 54, "height": 66, @@ -171,8 +171,8 @@ "id": "e", "type": "rectangle", "pos": { - "x": 490, - "y": 1854 + "x": 546, + "y": 1904 }, "width": 53, "height": 66, @@ -212,8 +212,8 @@ "id": "f", "type": "rectangle", "pos": { - "x": 564, - "y": 1718 + "x": 474, + "y": 1768 }, "width": 51, "height": 66, @@ -253,8 +253,8 @@ "id": "g", "type": "rectangle", "pos": { - "x": 170, - "y": 1718 + "x": 243, + "y": 1768 }, "width": 80, "height": 66, @@ -294,8 +294,8 @@ "id": "h", "type": "rectangle", "pos": { - "x": 238, - "y": 1011 + "x": 311, + "y": 1061 }, "width": 53, "height": 66, @@ -335,8 +335,8 @@ "id": "i", "type": "rectangle", "pos": { - "x": 403, - "y": 1011 + "x": 452, + "y": 1061 }, "width": 546, "height": 522, @@ -376,8 +376,8 @@ "id": "i.j", "type": "rectangle", "pos": { - "x": 675, - "y": 1061 + "x": 724, + "y": 1111 }, "width": 222, "height": 166, @@ -417,8 +417,8 @@ "id": "i.j.k", "type": "rectangle", "pos": { - "x": 725, - "y": 1111 + "x": 774, + "y": 1161 }, "width": 53, "height": 66, @@ -458,8 +458,8 @@ "id": "i.j.l", "type": "rectangle", "pos": { - "x": 798, - "y": 1111 + "x": 847, + "y": 1161 }, "width": 49, "height": 66, @@ -499,8 +499,8 @@ "id": "i.m", "type": "rectangle", "pos": { - "x": 453, - "y": 1377 + "x": 502, + "y": 1427 }, "width": 200, "height": 66, @@ -540,8 +540,8 @@ "id": "i.n", "type": "rectangle", "pos": { - "x": 673, - "y": 1417 + "x": 722, + "y": 1467 }, "width": 53, "height": 66, @@ -581,8 +581,8 @@ "id": "i.o", "type": "rectangle", "pos": { - "x": 746, - "y": 1317 + "x": 795, + "y": 1367 }, "width": 153, "height": 166, @@ -622,8 +622,8 @@ "id": "i.o.p", "type": "rectangle", "pos": { - "x": 796, - "y": 1367 + "x": 845, + "y": 1417 }, "width": 53, "height": 66, @@ -663,8 +663,8 @@ "id": "q", "type": "rectangle", "pos": { - "x": 895, - "y": 1718 + "x": 968, + "y": 1768 }, "width": 80, "height": 66, @@ -704,7 +704,7 @@ "id": "r", "type": "rectangle", "pos": { - "x": 85, + "x": 158, "y": 12 }, "width": 806, @@ -745,7 +745,7 @@ "id": "r.s", "type": "rectangle", "pos": { - "x": 135, + "x": 208, "y": 313 }, "width": 543, @@ -786,7 +786,7 @@ "id": "r.s.t", "type": "rectangle", "pos": { - "x": 185, + "x": 258, "y": 551 }, "width": 120, @@ -827,7 +827,7 @@ "id": "r.s.u", "type": "rectangle", "pos": { - "x": 325, + "x": 398, "y": 509 }, "width": 154, @@ -868,7 +868,7 @@ "id": "r.s.u.v", "type": "rectangle", "pos": { - "x": 375, + "x": 448, "y": 559 }, "width": 54, @@ -909,7 +909,7 @@ "id": "r.s.w", "type": "rectangle", "pos": { - "x": 499, + "x": 572, "y": 561 }, "width": 58, @@ -950,7 +950,7 @@ "id": "r.s.x", "type": "rectangle", "pos": { - "x": 474, + "x": 547, "y": 363 }, "width": 80, @@ -991,7 +991,7 @@ "id": "r.s.y", "type": "rectangle", "pos": { - "x": 574, + "x": 647, "y": 363 }, "width": 54, @@ -1032,7 +1032,7 @@ "id": "r.z", "type": "rectangle", "pos": { - "x": 376, + "x": 449, "y": 805 }, "width": 52, @@ -1073,7 +1073,7 @@ "id": "r.aa", "type": "rectangle", "pos": { - "x": 184, + "x": 257, "y": 162 }, "width": 62, @@ -1114,7 +1114,7 @@ "id": "r.bb", "type": "rectangle", "pos": { - "x": 266, + "x": 339, "y": 62 }, "width": 245, @@ -1155,7 +1155,7 @@ "id": "r.bb.cc", "type": "rectangle", "pos": { - "x": 316, + "x": 389, "y": 112 }, "width": 61, @@ -1196,7 +1196,7 @@ "id": "r.bb.dd", "type": "rectangle", "pos": { - "x": 397, + "x": 470, "y": 112 }, "width": 64, @@ -1237,7 +1237,7 @@ "id": "r.ee", "type": "rectangle", "pos": { - "x": 696, + "x": 769, "y": 162 }, "width": 62, @@ -1278,7 +1278,7 @@ "id": "r.ff", "type": "rectangle", "pos": { - "x": 698, + "x": 771, "y": 313 }, "width": 57, @@ -1319,7 +1319,7 @@ "id": "r.gg", "type": "rectangle", "pos": { - "x": 778, + "x": 851, "y": 162 }, "width": 63, @@ -1383,20 +1383,20 @@ "labelPercentage": 0, "route": [ { - "x": 751.5833333333333, - "y": 1177 + "x": 801.25, + "y": 1227 }, { - "x": 751.5833333333333, - "y": 1272 + "x": 801.25, + "y": 1322 }, { - "x": 603.0833333333333, - "y": 1272 + "x": 652.75, + "y": 1322 }, { - "x": 603.0833333333333, - "y": 1377.625 + "x": 652.75, + "y": 1427.625 } ], "animated": false, @@ -1429,12 +1429,12 @@ "labelPercentage": 0, "route": [ { - "x": 822.5833333333333, - "y": 1177 + "x": 872.25, + "y": 1227 }, { - "x": 822.5833333333333, - "y": 1367 + "x": 872.25, + "y": 1417 } ], "animated": false, @@ -1467,28 +1467,28 @@ "labelPercentage": 0, "route": [ { - "x": 955.75, - "y": 1718 + "x": 1028.75, + "y": 1768 }, { - "x": 955.75, - "y": 1578 + "x": 1028.75, + "y": 1628 }, { - "x": 989.0833333333333, - "y": 1578 + "x": 1038.75, + "y": 1628 }, { - "x": 989.0833333333333, - "y": 966 + "x": 1038.75, + "y": 1016 }, { - "x": 553.0833333333333, - "y": 966 + "x": 602.75, + "y": 1016 }, { - "x": 553.0833333333333, - "y": 1377.625 + "x": 602.75, + "y": 1427.625 } ], "animated": false, @@ -1521,20 +1521,20 @@ "labelPercentage": 0, "route": [ { - "x": 619.7499999999999, - "y": 1443.625 + "x": 669.4166666666666, + "y": 1493.625 }, { - "x": 619.7499999999999, - "y": 1628 + "x": 669.4166666666666, + "y": 1678 }, { - "x": 915.75, - "y": 1628 + "x": 988.75, + "y": 1678 }, { - "x": 915.75, - "y": 1718 + "x": 988.75, + "y": 1768 } ], "animated": false, @@ -1567,20 +1567,20 @@ "labelPercentage": 0, "route": [ { - "x": 699.5833333333333, - "y": 1483 + "x": 749.25, + "y": 1533 }, { - "x": 699.5833333333333, - "y": 1578 + "x": 749.25, + "y": 1628 }, { - "x": 935.75, - "y": 1578 + "x": 1008.75, + "y": 1628 }, { - "x": 935.75, - "y": 1718 + "x": 1008.75, + "y": 1768 } ], "animated": false, @@ -1613,20 +1613,12 @@ "labelPercentage": 0, "route": [ { - "x": 519.7499999999999, - "y": 1443.625 + "x": 646.1666666666666, + "y": 1493.625 }, { - "x": 519.7499999999999, - "y": 1628 - }, - { - "x": 443.91666666666663, - "y": 1628 - }, - { - "x": 443.91666666666663, - "y": 1718 + "x": 646.1666666666666, + "y": 1768 } ], "animated": false, @@ -1659,20 +1651,20 @@ "labelPercentage": 0, "route": [ { - "x": 553.0833333333333, - "y": 1443.625 + "x": 602.75, + "y": 1493.625 }, { - "x": 553.0833333333333, - "y": 1678 + "x": 602.75, + "y": 1728 }, { - "x": 517.4166666666666, - "y": 1678 + "x": 572.6666666666666, + "y": 1728 }, { - "x": 517.4166666666666, - "y": 1718 + "x": 572.6666666666666, + "y": 1768 } ], "animated": false, @@ -1705,20 +1697,20 @@ "labelPercentage": 0, "route": [ { - "x": 486.4166666666666, - "y": 1443.625 + "x": 536.0833333333334, + "y": 1493.625 }, { - "x": 486.4166666666666, - "y": 1578 + "x": 536.0833333333333, + "y": 1628 }, { - "x": 224.16666666666663, - "y": 1578 + "x": 297.16666666666663, + "y": 1628 }, { - "x": 224.16666666666663, - "y": 1718 + "x": 297.16666666666663, + "y": 1768 } ], "animated": false, @@ -1751,12 +1743,20 @@ "labelPercentage": 0, "route": [ { - "x": 589.9166666666666, - "y": 1443.625 + "x": 569.4166666666666, + "y": 1493.625 }, { - "x": 589.9166666666666, - "y": 1718 + "x": 569.4166666666666, + "y": 1678 + }, + { + "x": 500.16666666666663, + "y": 1678 + }, + { + "x": 500.16666666666663, + "y": 1768 } ], "animated": false, @@ -1789,12 +1789,12 @@ "labelPercentage": 0, "route": [ { - "x": 517.4166666666666, - "y": 1784 + "x": 572.6666666666666, + "y": 1834 }, { - "x": 517.4166666666666, - "y": 1854 + "x": 572.6666666666666, + "y": 1904 } ], "animated": false, @@ -1827,19 +1827,19 @@ "labelPercentage": 0, "route": [ { - "x": 501.3333333333333, + "x": 574.3333333333333, "y": 429 }, { - "x": 501.3333333333333, + "x": 574.3333333333333, "y": 469 }, { - "x": 275, + "x": 348, "y": 469 }, { - "x": 275, + "x": 348, "y": 551 } ], @@ -1873,11 +1873,11 @@ "labelPercentage": 0, "route": [ { - "x": 528, + "x": 601, "y": 429 }, { - "x": 528, + "x": 601, "y": 561.5 } ], @@ -1911,19 +1911,19 @@ "labelPercentage": 0, "route": [ { - "x": 809.6666666666666, + "x": 882.6666666666666, "y": 228 }, { - "x": 809.6666666666666, + "x": 882.6666666666666, "y": 268 }, { - "x": 245, + "x": 318, "y": 268 }, { - "x": 245, + "x": 318, "y": 551 } ], @@ -1957,11 +1957,11 @@ "labelPercentage": 0, "route": [ { - "x": 402, + "x": 475, "y": 625 }, { - "x": 402, + "x": 475, "y": 805 } ], @@ -1995,11 +1995,11 @@ "labelPercentage": 0, "route": [ { - "x": 215, + "x": 288, "y": 228 }, { - "x": 215, + "x": 288, "y": 551 } ], @@ -2033,12 +2033,20 @@ "labelPercentage": 0, "route": [ { - "x": 528, + "x": 601, "y": 627.5 }, { - "x": 528, - "y": 1377.625 + "x": 601, + "y": 966 + }, + { + "x": 552.75, + "y": 966 + }, + { + "x": 552.75, + "y": 1427.625 } ], "animated": false, @@ -2071,12 +2079,12 @@ "labelPercentage": 0, "route": [ { - "x": 197.5, + "x": 270.5, "y": 617 }, { - "x": 197.4999999999999, - "y": 1718 + "x": 270.4999999999999, + "y": 1768 } ], "animated": false, @@ -2109,12 +2117,12 @@ "labelPercentage": 0, "route": [ { - "x": 265, + "x": 338, "y": 617 }, { - "x": 265, - "y": 1011 + "x": 338, + "y": 1061 } ], "animated": false, @@ -2147,11 +2155,11 @@ "labelPercentage": 0, "route": [ { - "x": 727.1666666666666, + "x": 800.1666666666666, "y": 228 }, { - "x": 727.1666666666666, + "x": 800.1666666666666, "y": 313 } ], diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 918f03e03..6acaaca67 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-1712326698 .fill-N1{fill:#0A0F25;} + .d2-1712326698 .fill-N2{fill:#676C7E;} + .d2-1712326698 .fill-N3{fill:#9499AB;} + .d2-1712326698 .fill-N4{fill:#CFD2DD;} + .d2-1712326698 .fill-N5{fill:#DEE1EB;} + .d2-1712326698 .fill-N6{fill:#EEF1F8;} + .d2-1712326698 .fill-N7{fill:#FFFFFF;} + .d2-1712326698 .fill-B1{fill:#0D32B2;} + .d2-1712326698 .fill-B2{fill:#0D32B2;} + .d2-1712326698 .fill-B3{fill:#E3E9FD;} + .d2-1712326698 .fill-B4{fill:#E3E9FD;} + .d2-1712326698 .fill-B5{fill:#EDF0FD;} + .d2-1712326698 .fill-B6{fill:#F7F8FE;} + .d2-1712326698 .fill-AA2{fill:#4A6FF3;} + .d2-1712326698 .fill-AA4{fill:#EDF0FD;} + .d2-1712326698 .fill-AA5{fill:#F7F8FE;} + .d2-1712326698 .fill-AB4{fill:#EDF0FD;} + .d2-1712326698 .fill-AB5{fill:#F7F8FE;} + .d2-1712326698 .stroke-N1{stroke:#0A0F25;} + .d2-1712326698 .stroke-N2{stroke:#676C7E;} + .d2-1712326698 .stroke-N3{stroke:#9499AB;} + .d2-1712326698 .stroke-N4{stroke:#CFD2DD;} + .d2-1712326698 .stroke-N5{stroke:#DEE1EB;} + .d2-1712326698 .stroke-N6{stroke:#EEF1F8;} + .d2-1712326698 .stroke-N7{stroke:#FFFFFF;} + .d2-1712326698 .stroke-B1{stroke:#0D32B2;} + .d2-1712326698 .stroke-B2{stroke:#0D32B2;} + .d2-1712326698 .stroke-B3{stroke:#E3E9FD;} + .d2-1712326698 .stroke-B4{stroke:#E3E9FD;} + .d2-1712326698 .stroke-B5{stroke:#EDF0FD;} + .d2-1712326698 .stroke-B6{stroke:#F7F8FE;} + .d2-1712326698 .stroke-AA2{stroke:#4A6FF3;} + .d2-1712326698 .stroke-AA4{stroke:#EDF0FD;} + .d2-1712326698 .stroke-AA5{stroke:#F7F8FE;} + .d2-1712326698 .stroke-AB4{stroke:#EDF0FD;} + .d2-1712326698 .stroke-AB5{stroke:#F7F8FE;} + .d2-1712326698 .background-color-N1{background-color:#0A0F25;} + .d2-1712326698 .background-color-N2{background-color:#676C7E;} + .d2-1712326698 .background-color-N3{background-color:#9499AB;} + .d2-1712326698 .background-color-N4{background-color:#CFD2DD;} + .d2-1712326698 .background-color-N5{background-color:#DEE1EB;} + .d2-1712326698 .background-color-N6{background-color:#EEF1F8;} + .d2-1712326698 .background-color-N7{background-color:#FFFFFF;} + .d2-1712326698 .background-color-B1{background-color:#0D32B2;} + .d2-1712326698 .background-color-B2{background-color:#0D32B2;} + .d2-1712326698 .background-color-B3{background-color:#E3E9FD;} + .d2-1712326698 .background-color-B4{background-color:#E3E9FD;} + .d2-1712326698 .background-color-B5{background-color:#EDF0FD;} + .d2-1712326698 .background-color-B6{background-color:#F7F8FE;} + .d2-1712326698 .background-color-AA2{background-color:#4A6FF3;} + .d2-1712326698 .background-color-AA4{background-color:#EDF0FD;} + .d2-1712326698 .background-color-AA5{background-color:#F7F8FE;} + .d2-1712326698 .background-color-AB4{background-color:#EDF0FD;} + .d2-1712326698 .background-color-AB5{background-color:#F7F8FE;} + .d2-1712326698 .color-N1{color:#0A0F25;} + .d2-1712326698 .color-N2{color:#676C7E;} + .d2-1712326698 .color-N3{color:#9499AB;} + .d2-1712326698 .color-N4{color:#CFD2DD;} + .d2-1712326698 .color-N5{color:#DEE1EB;} + .d2-1712326698 .color-N6{color:#EEF1F8;} + .d2-1712326698 .color-N7{color:#FFFFFF;} + .d2-1712326698 .color-B1{color:#0D32B2;} + .d2-1712326698 .color-B2{color:#0D32B2;} + .d2-1712326698 .color-B3{color:#E3E9FD;} + .d2-1712326698 .color-B4{color:#E3E9FD;} + .d2-1712326698 .color-B5{color:#EDF0FD;} + .d2-1712326698 .color-B6{color:#F7F8FE;} + .d2-1712326698 .color-AA2{color:#4A6FF3;} + .d2-1712326698 .color-AA4{color:#EDF0FD;} + .d2-1712326698 .color-AA5{color:#F7F8FE;} + .d2-1712326698 .color-AB4{color:#EDF0FD;} + .d2-1712326698 .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/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 90d1af957..7d0563ca6 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": 559, + "x": 1287, "y": 148 }, "width": 64, @@ -48,7 +48,7 @@ "id": "FL", "type": "rectangle", "pos": { - "x": 551, + "x": 1279, "y": 294 }, "width": 80, @@ -89,8 +89,8 @@ "id": "GA", "type": "rectangle", "pos": { - "x": 551, - "y": 590 + "x": 1279, + "y": 440 }, "width": 80, "height": 66, @@ -130,8 +130,8 @@ "id": "MS", "type": "rectangle", "pos": { - "x": 405, - "y": 836 + "x": 1412, + "y": 686 }, "width": 160, "height": 66, @@ -171,8 +171,8 @@ "id": "TN", "type": "rectangle", "pos": { - "x": 524, - "y": 3116 + "x": 1090, + "y": 2366 }, "width": 280, "height": 66, @@ -212,7 +212,7 @@ "id": "AK", "type": "rectangle", "pos": { - "x": 1003, + "x": 677, "y": 12 }, "width": 66, @@ -253,8 +253,8 @@ "id": "AZ", "type": "rectangle", "pos": { - "x": 1724, - "y": 836 + "x": 81, + "y": 686 }, "width": 65, "height": 66, @@ -294,8 +294,8 @@ "id": "CA", "type": "rectangle", "pos": { - "x": 1716, - "y": 1232 + "x": 73, + "y": 1032 }, "width": 80, "height": 66, @@ -335,8 +335,8 @@ "id": "NV", "type": "rectangle", "pos": { - "x": 1656, - "y": 1628 + "x": 60, + "y": 1428 }, "width": 160, "height": 66, @@ -376,8 +376,8 @@ "id": "NM", "type": "rectangle", "pos": { - "x": 1121, - "y": 1974 + "x": 206, + "y": 1674 }, "width": 120, "height": 66, @@ -417,8 +417,8 @@ "id": "UT", "type": "rectangle", "pos": { - "x": 1522, - "y": 3116 + "x": 12, + "y": 2366 }, "width": 160, "height": 66, @@ -458,7 +458,7 @@ "id": "AR", "type": "rectangle", "pos": { - "x": 425, + "x": 1479, "y": 294 }, "width": 66, @@ -499,8 +499,8 @@ "id": "LA", "type": "rectangle", "pos": { - "x": 418, - "y": 590 + "x": 1472, + "y": 440 }, "width": 80, "height": 66, @@ -540,8 +540,8 @@ "id": "MO", "type": "rectangle", "pos": { - "x": 1151, - "y": 1232 + "x": 562, + "y": 1032 }, "width": 240, "height": 66, @@ -581,8 +581,8 @@ "id": "OK", "type": "rectangle", "pos": { - "x": 719, - "y": 2520 + "x": 333, + "y": 2020 }, "width": 200, "height": 66, @@ -622,8 +622,8 @@ "id": "TX", "type": "rectangle", "pos": { - "x": 387, - "y": 3362 + "x": 659, + "y": 2662 }, "width": 160, "height": 66, @@ -663,8 +663,8 @@ "id": "OR", "type": "rectangle", "pos": { - "x": 1692, - "y": 1974 + "x": 35, + "y": 1674 }, "width": 120, "height": 66, @@ -704,8 +704,8 @@ "id": "CO", "type": "rectangle", "pos": { - "x": 794, - "y": 590 + "x": 287, + "y": 440 }, "width": 66, "height": 66, @@ -745,8 +745,8 @@ "id": "KS", "type": "rectangle", "pos": { - "x": 1018, - "y": 836 + "x": 280, + "y": 686 }, "width": 80, "height": 66, @@ -786,8 +786,8 @@ "id": "NE", "type": "rectangle", "pos": { - "x": 1061, - "y": 1628 + "x": 345, + "y": 1428 }, "width": 200, "height": 66, @@ -827,8 +827,8 @@ "id": "WY", "type": "rectangle", "pos": { - "x": 1446, - "y": 3708 + "x": 272, + "y": 2908 }, "width": 240, "height": 66, @@ -868,8 +868,8 @@ "id": "CT", "type": "rectangle", "pos": { - "x": 120, - "y": 1232 + "x": 1669, + "y": 1032 }, "width": 64, "height": 66, @@ -909,8 +909,8 @@ "id": "MA", "type": "rectangle", "pos": { - "x": 112, - "y": 1628 + "x": 1661, + "y": 1428 }, "width": 80, "height": 66, @@ -950,8 +950,8 @@ "id": "NY", "type": "rectangle", "pos": { - "x": 85, - "y": 2520 + "x": 1664, + "y": 2020 }, "width": 160, "height": 66, @@ -991,8 +991,8 @@ "id": "RI", "type": "rectangle", "pos": { - "x": 87, - "y": 3362 + "x": 1723, + "y": 2662 }, "width": 120, "height": 66, @@ -1032,8 +1032,8 @@ "id": "DE", "type": "rectangle", "pos": { - "x": 259, - "y": 1232 + "x": 1770, + "y": 1032 }, "width": 63, "height": 66, @@ -1073,8 +1073,8 @@ "id": "MD", "type": "rectangle", "pos": { - "x": 250, - "y": 1628 + "x": 1761, + "y": 1428 }, "width": 80, "height": 66, @@ -1114,8 +1114,8 @@ "id": "NJ", "type": "rectangle", "pos": { - "x": 237, - "y": 1974 + "x": 1679, + "y": 1674 }, "width": 80, "height": 66, @@ -1155,8 +1155,8 @@ "id": "PA", "type": "rectangle", "pos": { - "x": 190, - "y": 3116 + "x": 1541, + "y": 2366 }, "width": 200, "height": 66, @@ -1196,8 +1196,8 @@ "id": "NC", "type": "rectangle", "pos": { - "x": 565, - "y": 1974 + "x": 1266, + "y": 1674 }, "width": 80, "height": 66, @@ -1237,8 +1237,8 @@ "id": "SC", "type": "rectangle", "pos": { - "x": 565, - "y": 2520 + "x": 1266, + "y": 2020 }, "width": 80, "height": 66, @@ -1278,7 +1278,7 @@ "id": "HI", "type": "rectangle", "pos": { - "x": 924, + "x": 840, "y": 12 }, "width": 59, @@ -1319,8 +1319,8 @@ "id": "ID", "type": "rectangle", "pos": { - "x": 1576, - "y": 836 + "x": 472, + "y": 686 }, "width": 59, "height": 66, @@ -1360,8 +1360,8 @@ "id": "MT", "type": "rectangle", "pos": { - "x": 1465, - "y": 1232 + "x": 462, + "y": 1032 }, "width": 80, "height": 66, @@ -1401,8 +1401,8 @@ "id": "WA", "type": "rectangle", "pos": { - "x": 1724, - "y": 3362 + "x": 169, + "y": 2662 }, "width": 80, "height": 66, @@ -1442,7 +1442,7 @@ "id": "IL", "type": "rectangle", "pos": { - "x": 1089, + "x": 763, "y": 12 }, "width": 57, @@ -1483,7 +1483,7 @@ "id": "IN", "type": "rectangle", "pos": { - "x": 1077, + "x": 751, "y": 148 }, "width": 80, @@ -1524,7 +1524,7 @@ "id": "IA", "type": "rectangle", "pos": { - "x": 1425, + "x": 850, "y": 294 }, "width": 80, @@ -1565,8 +1565,8 @@ "id": "MI", "type": "rectangle", "pos": { - "x": 880, - "y": 590 + "x": 711, + "y": 440 }, "width": 120, "height": 66, @@ -1606,8 +1606,8 @@ "id": "KY", "type": "rectangle", "pos": { - "x": 997, - "y": 294 + "x": 602, + "y": 686 }, "width": 120, "height": 66, @@ -1647,8 +1647,8 @@ "id": "WI", "type": "rectangle", "pos": { - "x": 1281, - "y": 2520 + "x": 949, + "y": 2020 }, "width": 160, "height": 66, @@ -1688,8 +1688,8 @@ "id": "OH", "type": "rectangle", "pos": { - "x": 899, - "y": 1628 + "x": 1090, + "y": 1428 }, "width": 120, "height": 66, @@ -1729,8 +1729,8 @@ "id": "MN", "type": "rectangle", "pos": { - "x": 1385, - "y": 836 + "x": 883, + "y": 686 }, "width": 120, "height": 66, @@ -1770,8 +1770,8 @@ "id": "SD", "type": "rectangle", "pos": { - "x": 1405, - "y": 1974 + "x": 599, + "y": 1674 }, "width": 200, "height": 66, @@ -1811,8 +1811,8 @@ "id": "VA", "type": "rectangle", "pos": { - "x": 620, - "y": 3362 + "x": 1180, + "y": 2662 }, "width": 160, "height": 66, @@ -1852,8 +1852,8 @@ "id": "WV", "type": "rectangle", "pos": { - "x": 522, - "y": 3708 + "x": 1193, + "y": 2908 }, "width": 200, "height": 66, @@ -1893,8 +1893,8 @@ "id": "ME", "type": "rectangle", "pos": { - "x": 12, - "y": 1628 + "x": 1894, + "y": 1428 }, "width": 65, "height": 66, @@ -1934,8 +1934,8 @@ "id": "NH", "type": "rectangle", "pos": { - "x": 17, - "y": 1974 + "x": 1858, + "y": 1674 }, "width": 80, "height": 66, @@ -1975,8 +1975,8 @@ "id": "VT", "type": "rectangle", "pos": { - "x": 42, - "y": 3708 + "x": 1753, + "y": 2908 }, "width": 120, "height": 66, @@ -2016,8 +2016,8 @@ "id": "ND", "type": "rectangle", "pos": { - "x": 1478, - "y": 1628 + "x": 669, + "y": 1428 }, "width": 120, "height": 66, @@ -2080,11 +2080,11 @@ "labelPercentage": 0, "route": [ { - "x": 591.8333333333333, + "x": 1319.654761904762, "y": 214 }, { - "x": 591.8333333333333, + "x": 1319.654761904762, "y": 294 } ], @@ -2118,12 +2118,12 @@ "labelPercentage": 0, "route": [ { - "x": 578.4999999999999, + "x": 1306.3214285714284, "y": 360 }, { - "x": 578.4999999999999, - "y": 590 + "x": 1306.3214285714284, + "y": 440 } ], "animated": false, @@ -2156,20 +2156,20 @@ "labelPercentage": 0, "route": [ { - "x": 578.4999999999999, - "y": 656 + "x": 1332.988095238095, + "y": 506 }, { - "x": 578.4999999999999, - "y": 696 + "x": 1332.988095238095, + "y": 546 }, { - "x": 525.1666666666665, - "y": 696 + "x": 1452.0476190476193, + "y": 546 }, { - "x": 525.1666666666665, - "y": 836 + "x": 1452.0476190476193, + "y": 686 } ], "animated": false, @@ -2202,20 +2202,20 @@ "labelPercentage": 0, "route": [ { - "x": 469.1666666666665, - "y": 902 + "x": 1497.5476190476193, + "y": 752 }, { - "x": 469.1666666666665, - "y": 2776 + "x": 1497.5476190476193, + "y": 2276 }, { - "x": 559.3690476190477, - "y": 2776 + "x": 1300.154761904762, + "y": 2276 }, { - "x": 559.3690476190477, - "y": 3116 + "x": 1300.154761904762, + "y": 2366 } ], "animated": false, @@ -2248,12 +2248,12 @@ "labelPercentage": 0, "route": [ { - "x": 1756.6666666666667, - "y": 902 + "x": 113.90476190476197, + "y": 752 }, { - "x": 1756.6666666666667, - "y": 1232 + "x": 113.90476190476197, + "y": 1032 } ], "animated": false, @@ -2286,12 +2286,12 @@ "labelPercentage": 0, "route": [ { - "x": 1736.6666666666665, - "y": 1298 + "x": 100.57142857142864, + "y": 1098 }, { - "x": 1736.6666666666665, - "y": 1628 + "x": 100.57142857142867, + "y": 1428 } ], "animated": false, @@ -2324,20 +2324,20 @@ "labelPercentage": 0, "route": [ { - "x": 1688.6666666666665, - "y": 1694 + "x": 188.57142857142867, + "y": 1494 }, { - "x": 1688.6666666666665, - "y": 1834 + "x": 188.57142857142867, + "y": 1534 }, { - "x": 1201.1666666666667, - "y": 1834 + "x": 246.46428571428578, + "y": 1534 }, { - "x": 1201.1666666666667, - "y": 1974 + "x": 246.46428571428578, + "y": 1674 } ], "animated": false, @@ -2370,20 +2370,28 @@ "labelPercentage": 0, "route": [ { - "x": 1211.1666666666667, - "y": 2040 + "x": 236.46428571428578, + "y": 1740 }, { - "x": 1211.1666666666667, - "y": 2480 + "x": 236.46428571428578, + "y": 1930 }, { - "x": 1586.4166666666667, - "y": 2480 + "x": 292.6309523809525, + "y": 1930 }, { - "x": 1586.4166666666667, - "y": 3116 + "x": 292.6309523809525, + "y": 2126 + }, + { + "x": 108, + "y": 2126 + }, + { + "x": 108, + "y": 2366 } ], "animated": false, @@ -2416,12 +2424,12 @@ "labelPercentage": 0, "route": [ { - "x": 458.5, + "x": 1512.0476190476193, "y": 360 }, { - "x": 458.5, - "y": 590 + "x": 1512.0476190476193, + "y": 440 } ], "animated": false, @@ -2454,12 +2462,12 @@ "labelPercentage": 0, "route": [ { - "x": 445.16666666666674, - "y": 656 + "x": 1492.0476190476193, + "y": 506 }, { - "x": 445.1666666666665, - "y": 836 + "x": 1492.0476190476193, + "y": 686 } ], "animated": false, @@ -2492,20 +2500,20 @@ "labelPercentage": 0, "route": [ { - "x": 533.1666666666665, - "y": 902 + "x": 1444.0476190476193, + "y": 752 }, { - "x": 533.1666666666665, - "y": 1042 + "x": 1444.0476190476193, + "y": 842 }, { - "x": 1191.4761904761904, - "y": 1042 + "x": 762.4880952380953, + "y": 842 }, { - "x": 1191.4761904761904, - "y": 1232 + "x": 762.4880952380953, + "y": 1032 } ], "animated": false, @@ -2538,20 +2546,28 @@ "labelPercentage": 0, "route": [ { - "x": 1185.7619047619048, - "y": 1298 + "x": 699.6309523809525, + "y": 1098 }, { - "x": 1185.7619047619048, - "y": 1338 + "x": 699.6309523809525, + "y": 1288 }, { - "x": 752.5000000000001, - "y": 1338 + "x": 866.559523809524, + "y": 1288 }, { - "x": 752.5000000000001, - "y": 2520 + "x": 866.559523809524, + "y": 1830 + }, + { + "x": 500.29761904761915, + "y": 1830 + }, + { + "x": 500.29761904761915, + "y": 2020 } ], "animated": false, @@ -2584,20 +2600,20 @@ "labelPercentage": 0, "route": [ { - "x": 819.1666666666667, - "y": 2586 + "x": 466.96428571428584, + "y": 2086 }, { - "x": 819.1666666666667, - "y": 2926 + "x": 466.96428571428584, + "y": 2276 }, { - "x": 699.3690476190477, - "y": 2926 + "x": 1125.154761904762, + "y": 2276 }, { - "x": 699.3690476190477, - "y": 3116 + "x": 1125.154761904762, + "y": 2366 } ], "animated": false, @@ -2630,20 +2646,20 @@ "labelPercentage": 0, "route": [ { - "x": 580.3690476190477, - "y": 3182 + "x": 1146.154761904762, + "y": 2432 }, { - "x": 580.3690476190477, - "y": 3222 + "x": 1146.154761904762, + "y": 2472 }, { - "x": 515.3690476190475, - "y": 3222 + "x": 755.654761904762, + "y": 2472 }, { - "x": 515.3690476190475, - "y": 3362 + "x": 755.654761904762, + "y": 2662 } ], "animated": false, @@ -2676,12 +2692,12 @@ "labelPercentage": 0, "route": [ { - "x": 1776.6666666666665, - "y": 1298 + "x": 140.57142857142867, + "y": 1098 }, { - "x": 1776.6666666666665, - "y": 1628 + "x": 140.57142857142867, + "y": 1428 } ], "animated": false, @@ -2714,12 +2730,20 @@ "labelPercentage": 0, "route": [ { - "x": 1722.6666666666665, - "y": 1694 + "x": 92.57142857142867, + "y": 1494 }, { - "x": 1722.6666666666665, - "y": 1974 + "x": 92.57142857142867, + "y": 1534 + }, + { + "x": 65.57142857142867, + "y": 1534 + }, + { + "x": 65.57142857142867, + "y": 1674 } ], "animated": false, @@ -2752,20 +2776,12 @@ "labelPercentage": 0, "route": [ { - "x": 827.6428571428571, - "y": 656 + "x": 320.07142857142867, + "y": 506 }, { - "x": 827.6428571428571, - "y": 746 - }, - { - "x": 1058.4761904761904, - "y": 746 - }, - { - "x": 1058.4761904761904, - "y": 836 + "x": 320.07142857142867, + "y": 686 } ], "animated": false, @@ -2798,20 +2814,20 @@ "labelPercentage": 0, "route": [ { - "x": 1045.142857142857, - "y": 902 + "x": 306.73809523809535, + "y": 752 }, { - "x": 1045.142857142857, - "y": 1438 + "x": 306.7380952380954, + "y": 1188 }, { - "x": 1101.1666666666667, - "y": 1438 + "x": 385.29761904761915, + "y": 1188 }, { - "x": 1101.1666666666667, - "y": 1628 + "x": 385.29761904761915, + "y": 1428 } ], "animated": false, @@ -2844,12 +2860,20 @@ "labelPercentage": 0, "route": [ { - "x": 1161.1666666666667, - "y": 1694 + "x": 378.63095238095246, + "y": 1494 }, { - "x": 1161.1666666666667, - "y": 1974 + "x": 378.63095238095246, + "y": 1534 + }, + { + "x": 286.4642857142858, + "y": 1534 + }, + { + "x": 286.4642857142858, + "y": 1674 } ], "animated": false, @@ -2882,20 +2906,20 @@ "labelPercentage": 0, "route": [ { - "x": 1151.1666666666667, - "y": 2040 + "x": 266.4642857142858, + "y": 1740 }, { - "x": 1151.1666666666667, - "y": 2080 + "x": 266.4642857142858, + "y": 1880 }, { - "x": 852.5, - "y": 2080 + "x": 366.96428571428584, + "y": 1880 }, { - "x": 852.5, - "y": 2520 + "x": 366.96428571428584, + "y": 2020 } ], "animated": false, @@ -2928,20 +2952,20 @@ "labelPercentage": 0, "route": [ { - "x": 885.8333333333334, - "y": 2586 + "x": 366.96428571428584, + "y": 2086 }, { - "x": 885.8333333333334, - "y": 3076 + "x": 366.96428571428584, + "y": 2176 }, { - "x": 1554.4166666666667, - "y": 3076 + "x": 140, + "y": 2176 }, { - "x": 1554.4166666666667, - "y": 3116 + "x": 140, + "y": 2366 } ], "animated": false, @@ -2974,20 +2998,20 @@ "labelPercentage": 0, "route": [ { - "x": 1559.1666666666667, - "y": 3182 + "x": 52, + "y": 2432 }, { - "x": 1559.1666666666667, - "y": 3518 + "x": 52, + "y": 2868 }, { - "x": 1583.7142857142858, - "y": 3518 + "x": 306.6904761904763, + "y": 2868 }, { - "x": 1583.7142857142858, - "y": 3708 + "x": 306.6904761904763, + "y": 2908 } ], "animated": false, @@ -3020,12 +3044,12 @@ "labelPercentage": 0, "route": [ { - "x": 152.16666666666674, - "y": 1298 + "x": 1701.8809523809527, + "y": 1098 }, { - "x": 152.16666666666674, - "y": 1628 + "x": 1701.8809523809527, + "y": 1428 } ], "animated": false, @@ -3058,12 +3082,28 @@ "labelPercentage": 0, "route": [ { - "x": 165.5, - "y": 1694 + "x": 1688.5476190476193, + "y": 1494 }, { - "x": 165.5, - "y": 2520 + "x": 1688.5476190476193, + "y": 1534 + }, + { + "x": 1629.3809523809527, + "y": 1534 + }, + { + "x": 1629.3809523809527, + "y": 1830 + }, + { + "x": 1704.321428571429, + "y": 1830 + }, + { + "x": 1704.321428571429, + "y": 2020 } ], "animated": false, @@ -3096,12 +3136,20 @@ "labelPercentage": 0, "route": [ { - "x": 116.5, - "y": 2586 + "x": 1760.321428571429, + "y": 2086 }, { - "x": 116.5, - "y": 3362 + "x": 1760.321428571429, + "y": 2276 + }, + { + "x": 1781.2142857142858, + "y": 2276 + }, + { + "x": 1781.2142857142858, + "y": 2662 } ], "animated": false, @@ -3134,12 +3182,12 @@ "labelPercentage": 0, "route": [ { - "x": 290.5, - "y": 1298 + "x": 1801.8809523809527, + "y": 1098 }, { - "x": 290.5, - "y": 1628 + "x": 1801.8809523809527, + "y": 1428 } ], "animated": false, @@ -3172,12 +3220,20 @@ "labelPercentage": 0, "route": [ { - "x": 277.16666666666674, - "y": 1694 + "x": 1788.5476190476193, + "y": 1494 }, { - "x": 277.1666666666665, - "y": 1974 + "x": 1788.5476190476193, + "y": 1634 + }, + { + "x": 1719.8809523809527, + "y": 1634 + }, + { + "x": 1719.8809523809527, + "y": 1674 } ], "animated": false, @@ -3210,12 +3266,20 @@ "labelPercentage": 0, "route": [ { - "x": 290.4999999999998, - "y": 2040 + "x": 1706.5476190476193, + "y": 1740 }, { - "x": 290.5, - "y": 3116 + "x": 1706.5476190476193, + "y": 1780 + }, + { + "x": 1605.1547619047624, + "y": 1780 + }, + { + "x": 1605.1547619047624, + "y": 2366 } ], "animated": false, @@ -3248,12 +3312,12 @@ "labelPercentage": 0, "route": [ { - "x": 605.1666666666666, + "x": 1332.988095238095, "y": 360 }, { - "x": 605.1666666666666, - "y": 590 + "x": 1332.988095238095, + "y": 440 } ], "animated": false, @@ -3286,12 +3350,12 @@ "labelPercentage": 0, "route": [ { - "x": 605.1666666666666, - "y": 656 + "x": 1306.3214285714284, + "y": 506 }, { - "x": 605.1666666666666, - "y": 1974 + "x": 1306.321428571429, + "y": 1674 } ], "animated": false, @@ -3324,12 +3388,12 @@ "labelPercentage": 0, "route": [ { - "x": 591.8333333333333, - "y": 2040 + "x": 1292.9880952380954, + "y": 1740 }, { - "x": 591.8333333333333, - "y": 2520 + "x": 1292.9880952380954, + "y": 2020 } ], "animated": false, @@ -3362,20 +3426,20 @@ "labelPercentage": 0, "route": [ { - "x": 591.8333333333333, - "y": 2586 + "x": 1292.9880952380954, + "y": 2086 }, { - "x": 591.8333333333333, - "y": 2676 + "x": 1292.9880952380954, + "y": 2176 }, { - "x": 629.3690476190477, - "y": 2676 + "x": 1230.154761904762, + "y": 2176 }, { - "x": 629.3690476190477, - "y": 3116 + "x": 1230.154761904762, + "y": 2366 } ], "animated": false, @@ -3408,20 +3472,12 @@ "labelPercentage": 0, "route": [ { - "x": 1605.8333333333333, - "y": 902 + "x": 502.48809523809535, + "y": 752 }, { - "x": 1605.8333333333333, - "y": 1142 - }, - { - "x": 1505.5833333333333, - "y": 1142 - }, - { - "x": 1505.5833333333333, - "y": 1232 + "x": 502.48809523809535, + "y": 1032 } ], "animated": false, @@ -3454,20 +3510,20 @@ "labelPercentage": 0, "route": [ { - "x": 1518.9166666666667, - "y": 1298 + "x": 489.15476190476204, + "y": 1098 }, { - "x": 1518.9166666666667, - "y": 1338 + "x": 489.15476190476204, + "y": 1138 }, { - "x": 1696.6666666666665, - "y": 1338 + "x": 180.57142857142867, + "y": 1138 }, { - "x": 1696.6666666666665, - "y": 1628 + "x": 180.57142857142867, + "y": 1428 } ], "animated": false, @@ -3500,12 +3556,20 @@ "labelPercentage": 0, "route": [ { - "x": 1752.6666666666665, - "y": 1694 + "x": 124.57142857142867, + "y": 1494 }, { - "x": 1752.6666666666665, - "y": 1974 + "x": 124.57142857142867, + "y": 1584 + }, + { + "x": 95.57142857142867, + "y": 1584 + }, + { + "x": 95.57142857142867, + "y": 1674 } ], "animated": false, @@ -3538,20 +3602,20 @@ "labelPercentage": 0, "route": [ { - "x": 1722.6666666666665, - "y": 2040 + "x": 65.57142857142867, + "y": 1740 }, { - "x": 1722.6666666666665, - "y": 2430 + "x": 65.57142857142867, + "y": 1780 }, { - "x": 1618.4166666666667, - "y": 2430 + "x": 45, + "y": 1780 }, { - "x": 1618.4166666666667, - "y": 3116 + "x": 45, + "y": 2366 } ], "animated": false, @@ -3584,20 +3648,20 @@ "labelPercentage": 0, "route": [ { - "x": 1642.4166666666667, - "y": 3182 + "x": 92, + "y": 2432 }, { - "x": 1642.4166666666667, - "y": 3222 + "x": 92, + "y": 2572 }, { - "x": 1751.1666666666667, - "y": 3222 + "x": 195.90476190476207, + "y": 2572 }, { - "x": 1751.1666666666667, - "y": 3362 + "x": 195.90476190476207, + "y": 2662 } ], "animated": false, @@ -3630,20 +3694,20 @@ "labelPercentage": 0, "route": [ { - "x": 1764.5, - "y": 3428 + "x": 209.2380952380954, + "y": 2728 }, { - "x": 1764.5, - "y": 3468 + "x": 209.2380952380954, + "y": 2818 }, { - "x": 1652.2857142857142, - "y": 3468 + "x": 340.9761904761906, + "y": 2818 }, { - "x": 1652.2857142857142, - "y": 3708 + "x": 340.9761904761906, + "y": 2908 } ], "animated": false, @@ -3676,11 +3740,11 @@ "labelPercentage": 0, "route": [ { - "x": 1117.702380952381, + "x": 791.5476190476192, "y": 78 }, { - "x": 1117.702380952381, + "x": 791.5476190476192, "y": 148 } ], @@ -3714,19 +3778,19 @@ "labelPercentage": 0, "route": [ { - "x": 1131.0357142857142, + "x": 804.8809523809525, "y": 214 }, { - "x": 1131.0357142857142, + "x": 804.8809523809525, "y": 254 }, { - "x": 1465.6666666666665, + "x": 890.8809523809523, "y": 254 }, { - "x": 1465.6666666666665, + "x": 890.8809523809523, "y": 294 } ], @@ -3760,20 +3824,20 @@ "labelPercentage": 0, "route": [ { - "x": 1452.3333333333333, + "x": 877.5476190476189, "y": 360 }, { - "x": 1452.3333333333333, - "y": 500 + "x": 877.5476190476189, + "y": 400 }, { - "x": 970.6428571428571, - "y": 500 + "x": 771.2142857142857, + "y": 400 }, { - "x": 970.6428571428571, - "y": 590 + "x": 771.2142857142857, + "y": 440 } ], "animated": false, @@ -3806,20 +3870,20 @@ "labelPercentage": 0, "route": [ { - "x": 940.6428571428571, - "y": 590 + "x": 735.2142857142857, + "y": 506 }, { - "x": 940.6428571428571, - "y": 450 + "x": 735.2142857142857, + "y": 596 }, { - "x": 1045.702380952381, - "y": 450 + "x": 662.4880952380953, + "y": 596 }, { - "x": 1045.702380952381, - "y": 360 + "x": 662.4880952380953, + "y": 686 } ], "animated": false, @@ -3852,20 +3916,12 @@ "labelPercentage": 0, "route": [ { - "x": 1069.702380952381, - "y": 360 + "x": 642.4880952380953, + "y": 752 }, { - "x": 1069.702380952381, - "y": 550 - }, - { - "x": 1271.4761904761904, - "y": 550 - }, - { - "x": 1271.4761904761904, - "y": 1232 + "x": 642.4880952380953, + "y": 1032 } ], "animated": false, @@ -3898,20 +3954,20 @@ "labelPercentage": 0, "route": [ { - "x": 1357.1904761904761, - "y": 1298 + "x": 733.9166666666667, + "y": 1098 }, { - "x": 1357.1904761904761, - "y": 1588 + "x": 733.9166666666667, + "y": 1238 }, { - "x": 1301.1666666666667, - "y": 1588 + "x": 1045.5357142857142, + "y": 1238 }, { - "x": 1301.1666666666667, - "y": 2520 + "x": 1045.5357142857142, + "y": 2020 } ], "animated": false, @@ -3944,12 +4000,20 @@ "labelPercentage": 0, "route": [ { - "x": 1104.3690476190477, + "x": 778.2142857142858, "y": 214 }, { - "x": 1104.3690476190477, - "y": 294 + "x": 778.2142857142858, + "y": 254 + }, + { + "x": 632.4880952380953, + "y": 254 + }, + { + "x": 632.4880952380953, + "y": 686 } ], "animated": false, @@ -3982,20 +4046,20 @@ "labelPercentage": 0, "route": [ { - "x": 1021.702380952381, - "y": 360 + "x": 692.4880952380953, + "y": 686 }, { - "x": 1021.702380952381, - "y": 400 + "x": 692.4880952380953, + "y": 646 }, { - "x": 910.6428571428571, - "y": 400 + "x": 759.2142857142857, + "y": 646 }, { - "x": 910.6428571428571, - "y": 590 + "x": 759.2142857142857, + "y": 506 } ], "animated": false, @@ -4028,28 +4092,28 @@ "labelPercentage": 0, "route": [ { - "x": 920.6428571428571, - "y": 656 + "x": 783.2142857142857, + "y": 506 }, { - "x": 920.6428571428571, - "y": 796 + "x": 783.2142857142857, + "y": 596 }, { - "x": 833.6428571428572, - "y": 796 + "x": 842.4880952380953, + "y": 596 }, { - "x": 833.6428571428572, - "y": 1388 + "x": 842.4880952380953, + "y": 1138 }, { - "x": 929.1666666666667, - "y": 1388 + "x": 1150.321428571429, + "y": 1138 }, { - "x": 929.1666666666667, - "y": 1628 + "x": 1150.321428571429, + "y": 1428 } ], "animated": false, @@ -4082,12 +4146,20 @@ "labelPercentage": 0, "route": [ { - "x": 1479, + "x": 904.2142857142857, "y": 360 }, { - "x": 1479, - "y": 836 + "x": 904.2142857142857, + "y": 400 + }, + { + "x": 963.4880952380953, + "y": 400 + }, + { + "x": 963.4880952380953, + "y": 686 } ], "animated": false, @@ -4120,20 +4192,20 @@ "labelPercentage": 0, "route": [ { - "x": 1445.3333333333333, - "y": 902 + "x": 913.4880952380953, + "y": 752 }, { - "x": 1445.3333333333333, - "y": 1042 + "x": 913.4880952380953, + "y": 792 }, { - "x": 1311.4761904761904, - "y": 1042 + "x": 722.4880952380953, + "y": 792 }, { - "x": 1311.4761904761904, - "y": 1232 + "x": 722.4880952380953, + "y": 1032 } ], "animated": false, @@ -4166,20 +4238,20 @@ "labelPercentage": 0, "route": [ { - "x": 1254.3333333333335, - "y": 1298 + "x": 596.7738095238096, + "y": 1098 }, { - "x": 1254.3333333333335, - "y": 1438 + "x": 596.7738095238096, + "y": 1188 }, { - "x": 1141.1666666666667, - "y": 1438 + "x": 425.29761904761915, + "y": 1188 }, { - "x": 1141.1666666666667, - "y": 1628 + "x": 425.29761904761915, + "y": 1428 } ], "animated": false, @@ -4212,20 +4284,20 @@ "labelPercentage": 0, "route": [ { - "x": 1194.5, - "y": 1694 + "x": 478.63095238095246, + "y": 1494 }, { - "x": 1194.5, - "y": 1784 + "x": 478.63095238095246, + "y": 1584 }, { - "x": 1438.9166666666665, - "y": 1784 + "x": 632.9880952380954, + "y": 1584 }, { - "x": 1438.9166666666665, - "y": 1974 + "x": 632.9880952380954, + "y": 1674 } ], "animated": false, @@ -4258,20 +4330,20 @@ "labelPercentage": 0, "route": [ { - "x": 1505.5833333333333, - "y": 2040 + "x": 732.9880952380953, + "y": 1740 }, { - "x": 1505.5833333333333, - "y": 2280 + "x": 732.9880952380953, + "y": 1880 }, { - "x": 1345.4166666666667, - "y": 2280 + "x": 981.5357142857143, + "y": 1880 }, { - "x": 1345.4166666666667, - "y": 2520 + "x": 981.5357142857143, + "y": 2020 } ], "animated": false, @@ -4304,20 +4376,20 @@ "labelPercentage": 0, "route": [ { - "x": 1071.8095238095239, - "y": 902 + "x": 333.40476190476204, + "y": 752 }, { - "x": 1071.8095238095239, - "y": 942 + "x": 333.40476190476204, + "y": 792 }, { - "x": 1231.4761904761904, - "y": 942 + "x": 602.4880952380953, + "y": 792 }, { - "x": 1231.4761904761904, - "y": 1232 + "x": 602.4880952380953, + "y": 1032 } ], "animated": false, @@ -4350,20 +4422,20 @@ "labelPercentage": 0, "route": [ { - "x": 1288.6190476190477, - "y": 1298 + "x": 631.059523809524, + "y": 1098 }, { - "x": 1288.6190476190477, - "y": 1488 + "x": 631.059523809524, + "y": 1238 }, { - "x": 1181.1666666666667, - "y": 1488 + "x": 465.29761904761915, + "y": 1238 }, { - "x": 1181.1666666666667, - "y": 1628 + "x": 465.29761904761915, + "y": 1428 } ], "animated": false, @@ -4396,20 +4468,28 @@ "labelPercentage": 0, "route": [ { - "x": 1094.5, - "y": 1694 + "x": 411.9642857142858, + "y": 1494 }, { - "x": 1094.5, - "y": 1784 + "x": 411.9642857142858, + "y": 1584 }, { - "x": 797, - "y": 1784 + "x": 377.46428571428584, + "y": 1584 }, { - "x": 797, - "y": 2520 + "x": 377.46428571428584, + "y": 1780 + }, + { + "x": 433.6309523809525, + "y": 1780 + }, + { + "x": 433.6309523809525, + "y": 2020 } ], "animated": false, @@ -4442,28 +4522,12 @@ "labelPercentage": 0, "route": [ { - "x": 1093.702380952381, - "y": 360 + "x": 682.4880952380953, + "y": 752 }, { - "x": 1093.702380952381, - "y": 400 - }, - { - "x": 1545.3333333333333, - "y": 400 - }, - { - "x": 1545.3333333333333, - "y": 1092 - }, - { - "x": 1351.4761904761904, - "y": 1092 - }, - { - "x": 1351.4761904761904, - "y": 1232 + "x": 682.4880952380953, + "y": 1032 } ], "animated": false, @@ -4496,20 +4560,20 @@ "labelPercentage": 0, "route": [ { - "x": 1220.047619047619, - "y": 1298 + "x": 768.2023809523811, + "y": 1098 }, { - "x": 1220.047619047619, - "y": 1388 + "x": 768.2023809523811, + "y": 1188 }, { - "x": 989.1666666666667, - "y": 1388 + "x": 1120.321428571429, + "y": 1188 }, { - "x": 989.1666666666667, - "y": 1628 + "x": 1120.321428571429, + "y": 1428 } ], "animated": false, @@ -4542,20 +4606,20 @@ "labelPercentage": 0, "route": [ { - "x": 959.1666666666667, - "y": 1694 + "x": 1151.821428571429, + "y": 1494 }, { - "x": 959.1666666666667, - "y": 3026 + "x": 1151.821428571429, + "y": 2176 }, { - "x": 769.3690476190477, - "y": 3026 + "x": 1195.154761904762, + "y": 2176 }, { - "x": 769.3690476190477, - "y": 3116 + "x": 1195.154761904762, + "y": 2366 } ], "animated": false, @@ -4588,20 +4652,12 @@ "labelPercentage": 0, "route": [ { - "x": 636.3690476190477, - "y": 3182 + "x": 1212.654761904762, + "y": 2432 }, { - "x": 636.3690476190477, - "y": 3272 - }, - { - "x": 684.3690476190476, - "y": 3272 - }, - { - "x": 684.3690476190476, - "y": 3362 + "x": 1212.654761904762, + "y": 2662 } ], "animated": false, @@ -4634,20 +4690,12 @@ "labelPercentage": 0, "route": [ { - "x": 660.3690476190476, - "y": 3428 + "x": 1227.3214285714284, + "y": 2728 }, { - "x": 660.3690476190476, - "y": 3468 - }, - { - "x": 622.0357142857142, - "y": 3468 - }, - { - "x": 622.0357142857142, - "y": 3708 + "x": 1227.3214285714284, + "y": 2908 } ], "animated": false, @@ -4680,12 +4728,12 @@ "labelPercentage": 0, "route": [ { - "x": 485.1666666666665, - "y": 656 + "x": 1532.0476190476193, + "y": 506 }, { - "x": 485.1666666666665, - "y": 836 + "x": 1532.0476190476193, + "y": 686 } ], "animated": false, @@ -4718,12 +4766,20 @@ "labelPercentage": 0, "route": [ { - "x": 430.5, - "y": 902 + "x": 1476.0476190476193, + "y": 752 }, { - "x": 430.5, - "y": 3362 + "x": 1476.0476190476193, + "y": 2522 + }, + { + "x": 787.654761904762, + "y": 2522 + }, + { + "x": 787.654761904762, + "y": 2662 } ], "animated": false, @@ -4756,12 +4812,12 @@ "labelPercentage": 0, "route": [ { - "x": 44.5, - "y": 1694 + "x": 1911.8809523809523, + "y": 1494 }, { - "x": 44.5, - "y": 1974 + "x": 1911.8809523809523, + "y": 1674 } ], "animated": false, @@ -4794,28 +4850,28 @@ "labelPercentage": 0, "route": [ { - "x": 303.83333333333326, - "y": 1694 + "x": 1815.2142857142858, + "y": 1494 }, { - "x": 303.83333333333326, - "y": 1734 + "x": 1815.2142857142858, + "y": 1534 }, { - "x": 357.1666666666665, - "y": 1734 + "x": 1978.5476190476193, + "y": 1534 }, { - "x": 357.1666666666665, - "y": 2626 + "x": 1978.5476190476193, + "y": 2226 }, { - "x": 323.83333333333326, - "y": 2626 + "x": 1707.8809523809527, + "y": 2226 }, { - "x": 323.83333333333326, - "y": 3116 + "x": 1707.8809523809527, + "y": 2366 } ], "animated": false, @@ -4848,20 +4904,20 @@ "labelPercentage": 0, "route": [ { - "x": 350.5, - "y": 3182 + "x": 1581.2142857142858, + "y": 2432 }, { - "x": 350.5, - "y": 3322 + "x": 1581.2142857142858, + "y": 2622 }, { - "x": 652.3690476190476, - "y": 3322 + "x": 1308.654761904762, + "y": 2622 }, { - "x": 652.3690476190476, - "y": 3362 + "x": 1308.654761904762, + "y": 2662 } ], "animated": false, @@ -4894,20 +4950,12 @@ "labelPercentage": 0, "route": [ { - "x": 700.3690476190476, - "y": 3428 + "x": 1260.654761904762, + "y": 2728 }, { - "x": 700.3690476190476, - "y": 3518 - }, - { - "x": 655.3690476190475, - "y": 3518 - }, - { - "x": 655.3690476190475, - "y": 3708 + "x": 1260.654761904762, + "y": 2908 } ], "animated": false, @@ -4940,20 +4988,20 @@ "labelPercentage": 0, "route": [ { - "x": 138.83333333333348, - "y": 1694 + "x": 1715.2142857142858, + "y": 1494 }, { - "x": 138.83333333333348, - "y": 1734 + "x": 1715.2142857142858, + "y": 1584 }, { - "x": 71.16666666666652, - "y": 1734 + "x": 1885.2142857142858, + "y": 1584 }, { - "x": 71.16666666666652, - "y": 1974 + "x": 1885.2142857142858, + "y": 1674 } ], "animated": false, @@ -4986,20 +5034,20 @@ "labelPercentage": 0, "route": [ { - "x": 71.16666666666652, - "y": 2040 + "x": 1885.2142857142858, + "y": 1740 }, { - "x": 71.16666666666652, - "y": 2080 + "x": 1885.2142857142858, + "y": 1780 }, { - "x": 125.5, - "y": 2080 + "x": 1784.321428571429, + "y": 1780 }, { - "x": 125.5, - "y": 2520 + "x": 1784.321428571429, + "y": 2020 } ], "animated": false, @@ -5032,12 +5080,12 @@ "labelPercentage": 0, "route": [ { - "x": 147.5, - "y": 2586 + "x": 1813.2142857142858, + "y": 2086 }, { - "x": 147.5, - "y": 3362 + "x": 1813.2142857142858, + "y": 2662 } ], "animated": false, @@ -5070,12 +5118,20 @@ "labelPercentage": 0, "route": [ { - "x": 102, - "y": 3428 + "x": 1763.2142857142858, + "y": 2728 }, { - "x": 102, - "y": 3708 + "x": 1763.2142857142858, + "y": 2818 + }, + { + "x": 1783.321428571429, + "y": 2818 + }, + { + "x": 1783.321428571429, + "y": 2908 } ], "animated": false, @@ -5108,20 +5164,20 @@ "labelPercentage": 0, "route": [ { - "x": 960.6428571428571, - "y": 656 + "x": 807.2142857142857, + "y": 506 }, { - "x": 960.6428571428571, - "y": 696 + "x": 807.2142857142857, + "y": 546 }, { - "x": 1425.3333333333333, - "y": 696 + "x": 923.4880952380953, + "y": 546 }, { - "x": 1425.3333333333333, - "y": 836 + "x": 923.4880952380953, + "y": 686 } ], "animated": false, @@ -5154,20 +5210,28 @@ "labelPercentage": 0, "route": [ { - "x": 1415.3333333333333, - "y": 902 + "x": 973.4880952380953, + "y": 752 }, { - "x": 1415.3333333333333, - "y": 992 + "x": 973.4880952380953, + "y": 892 }, { - "x": 959.1666666666667, - "y": 992 + "x": 1229.5476190476193, + "y": 892 }, { - "x": 959.1666666666667, - "y": 1628 + "x": 1229.5476190476193, + "y": 1138 + }, + { + "x": 1180.321428571429, + "y": 1138 + }, + { + "x": 1180.321428571429, + "y": 1428 } ], "animated": false, @@ -5200,28 +5264,20 @@ "labelPercentage": 0, "route": [ { - "x": 989.1666666666667, - "y": 1694 + "x": 1120.321428571429, + "y": 1494 }, { - "x": 989.1666666666667, - "y": 1934 + "x": 1120.321428571429, + "y": 1534 }, { - "x": 1651.6666666666665, - "y": 1934 + "x": 1097.0357142857147, + "y": 1534 }, { - "x": 1651.6666666666665, - "y": 2380 - }, - { - "x": 1409.4166666666667, - "y": 2380 - }, - { - "x": 1409.4166666666667, - "y": 2520 + "x": 1097.0357142857147, + "y": 2020 } ], "animated": false, @@ -5254,20 +5310,20 @@ "labelPercentage": 0, "route": [ { - "x": 1475.3333333333333, - "y": 902 + "x": 943.4880952380953, + "y": 752 }, { - "x": 1475.3333333333333, - "y": 1192 + "x": 943.4880952380953, + "y": 1338 }, { - "x": 1585.5833333333333, - "y": 1192 + "x": 749.654761904762, + "y": 1338 }, { - "x": 1585.5833333333333, - "y": 1628 + "x": 749.654761904762, + "y": 1428 } ], "animated": false, @@ -5300,12 +5356,12 @@ "labelPercentage": 0, "route": [ { - "x": 1505.5833333333333, - "y": 1694 + "x": 699.654761904762, + "y": 1494 }, { - "x": 1505.5833333333333, - "y": 1974 + "x": 699.654761904762, + "y": 1674 } ], "animated": false, @@ -5338,20 +5394,20 @@ "labelPercentage": 0, "route": [ { - "x": 1538.9166666666665, - "y": 2040 + "x": 766.3214285714287, + "y": 1740 }, { - "x": 1538.9166666666665, - "y": 2330 + "x": 766.3214285714287, + "y": 1780 }, { - "x": 1377.4166666666667, - "y": 2330 + "x": 1013.5357142857143, + "y": 1780 }, { - "x": 1377.4166666666667, - "y": 2520 + "x": 1013.5357142857143, + "y": 2020 } ], "animated": false, @@ -5384,20 +5440,20 @@ "labelPercentage": 0, "route": [ { - "x": 501.1666666666665, - "y": 902 + "x": 1519.0476190476193, + "y": 752 }, { - "x": 501.1666666666665, - "y": 2726 + "x": 1519.0476190476193, + "y": 2326 }, { - "x": 594.3690476190477, - "y": 2726 + "x": 1335.154761904762, + "y": 2326 }, { - "x": 594.3690476190477, - "y": 3116 + "x": 1335.154761904762, + "y": 2366 } ], "animated": false, @@ -5430,20 +5486,20 @@ "labelPercentage": 0, "route": [ { - "x": 1322.904761904762, - "y": 1298 + "x": 665.3452380952382, + "y": 1098 }, { - "x": 1322.904761904762, - "y": 1538 + "x": 665.3452380952382, + "y": 1388 }, { - "x": 1221.1666666666667, - "y": 1538 + "x": 505.29761904761915, + "y": 1388 }, { - "x": 1221.1666666666667, - "y": 1628 + "x": 505.29761904761915, + "y": 1428 } ], "animated": false, @@ -5476,20 +5532,20 @@ "labelPercentage": 0, "route": [ { - "x": 1127.8333333333335, - "y": 1694 + "x": 445.29761904761915, + "y": 1494 }, { - "x": 1127.8333333333335, - "y": 1834 + "x": 445.29761904761915, + "y": 1634 }, { - "x": 819.1666666666667, - "y": 1834 + "x": 462.96428571428584, + "y": 1634 }, { - "x": 819.1666666666667, - "y": 2520 + "x": 462.96428571428584, + "y": 2020 } ], "animated": false, @@ -5522,20 +5578,20 @@ "labelPercentage": 0, "route": [ { - "x": 852.5, - "y": 2586 + "x": 500.29761904761915, + "y": 2086 }, { - "x": 852.5, - "y": 2976 + "x": 500.29761904761915, + "y": 2226 }, { - "x": 734.3690476190477, - "y": 2976 + "x": 1160.154761904762, + "y": 2226 }, { - "x": 734.3690476190477, - "y": 3116 + "x": 1160.154761904762, + "y": 2366 } ], "animated": false, @@ -5568,12 +5624,20 @@ "labelPercentage": 0, "route": [ { - "x": 1492.25, - "y": 1298 + "x": 515.8214285714287, + "y": 1098 }, { - "x": 1492.25, - "y": 1628 + "x": 515.8214285714287, + "y": 1338 + }, + { + "x": 709.654761904762, + "y": 1338 + }, + { + "x": 709.654761904762, + "y": 1428 } ], "animated": false, @@ -5606,12 +5670,12 @@ "labelPercentage": 0, "route": [ { - "x": 1538.9166666666667, - "y": 1694 + "x": 732.9880952380953, + "y": 1494 }, { - "x": 1538.9166666666665, - "y": 1974 + "x": 732.9880952380953, + "y": 1674 } ], "animated": false, @@ -5644,28 +5708,28 @@ "labelPercentage": 0, "route": [ { - "x": 1438.9166666666665, - "y": 2040 + "x": 632.9880952380954, + "y": 1740 }, { - "x": 1438.9166666666665, - "y": 2180 + "x": 632.9880952380954, + "y": 1780 }, { - "x": 1116.9166666666667, - "y": 2180 + "x": 596.4880952380954, + "y": 1780 }, { - "x": 1116.9166666666667, - "y": 3668 + "x": 596.4880952380954, + "y": 2768 }, { - "x": 1480.857142857143, - "y": 3668 + "x": 409.54761904761915, + "y": 2768 }, { - "x": 1480.857142857143, - "y": 3708 + "x": 409.54761904761915, + "y": 2908 } ], "animated": false, @@ -5698,20 +5762,20 @@ "labelPercentage": 0, "route": [ { - "x": 1227.8333333333333, - "y": 1694 + "x": 511.9642857142858, + "y": 1494 }, { - "x": 1227.8333333333333, - "y": 1734 + "x": 511.9642857142858, + "y": 1534 }, { - "x": 1472.25, - "y": 1734 + "x": 666.3214285714287, + "y": 1534 }, { - "x": 1472.25, - "y": 1974 + "x": 666.3214285714287, + "y": 1674 } ], "animated": false, @@ -5744,28 +5808,28 @@ "labelPercentage": 0, "route": [ { - "x": 1472.25, - "y": 2040 + "x": 666.3214285714287, + "y": 1740 }, { - "x": 1472.25, - "y": 2230 + "x": 666.3214285714287, + "y": 1880 }, { - "x": 1139.5595238095239, - "y": 2230 + "x": 618.654761904762, + "y": 1880 }, { - "x": 1139.5595238095239, - "y": 3618 + "x": 618.654761904762, + "y": 2818 }, { - "x": 1515.142857142857, - "y": 3618 + "x": 443.8333333333335, + "y": 2818 }, { - "x": 1515.142857142857, - "y": 3708 + "x": 443.8333333333335, + "y": 2908 } ], "animated": false, @@ -5798,12 +5862,20 @@ "labelPercentage": 0, "route": [ { - "x": 1782.6666666666665, - "y": 1694 + "x": 156.57142857142867, + "y": 1494 }, { - "x": 1782.6666666666665, - "y": 1974 + "x": 156.57142857142867, + "y": 1634 + }, + { + "x": 125.57142857142867, + "y": 1634 + }, + { + "x": 125.57142857142867, + "y": 1674 } ], "animated": false, @@ -5836,20 +5908,20 @@ "labelPercentage": 0, "route": [ { - "x": 1752.6666666666665, - "y": 2040 + "x": 95.57142857142867, + "y": 1740 }, { - "x": 1752.6666666666665, - "y": 2626 + "x": 95.57142857142867, + "y": 1830 }, { - "x": 1650.4166666666667, - "y": 2626 + "x": 76, + "y": 1830 }, { - "x": 1650.4166666666667, - "y": 3116 + "x": 76, + "y": 2366 } ], "animated": false, @@ -5882,20 +5954,20 @@ "labelPercentage": 0, "route": [ { - "x": 44.5, - "y": 2040 + "x": 1911.8809523809523, + "y": 1740 }, { - "x": 44.5, - "y": 3468 + "x": 1911.8809523809523, + "y": 2768 }, { - "x": 72, - "y": 3468 + "x": 1843.321428571429, + "y": 2768 }, { - "x": 72, - "y": 3708 + "x": 1843.321428571429, + "y": 2908 } ], "animated": false, @@ -5928,20 +6000,12 @@ "labelPercentage": 0, "route": [ { - "x": 263.83333333333326, - "y": 2040 + "x": 1744.321428571429, + "y": 1740 }, { - "x": 263.83333333333326, - "y": 2080 - }, - { - "x": 205.5, - "y": 2080 - }, - { - "x": 205.5, - "y": 2520 + "x": 1744.321428571429, + "y": 2020 } ], "animated": false, @@ -5974,20 +6038,20 @@ "labelPercentage": 0, "route": [ { - "x": 181.5, - "y": 2586 + "x": 1696.321428571429, + "y": 2086 }, { - "x": 181.5, - "y": 2676 + "x": 1696.321428571429, + "y": 2126 }, { - "x": 223.83333333333326, - "y": 2676 + "x": 1641.2142857142858, + "y": 2126 }, { - "x": 223.83333333333326, - "y": 3116 + "x": 1641.2142857142858, + "y": 2366 } ], "animated": false, @@ -6020,20 +6084,20 @@ "labelPercentage": 0, "route": [ { - "x": 1181.1666666666667, - "y": 2040 + "x": 296.4642857142858, + "y": 1740 }, { - "x": 1181.1666666666667, - "y": 2130 + "x": 296.4642857142858, + "y": 1830 }, { - "x": 885.8333333333334, - "y": 2130 + "x": 400.29761904761915, + "y": 1830 }, { - "x": 885.8333333333334, - "y": 2520 + "x": 400.29761904761915, + "y": 2020 } ], "animated": false, @@ -6066,20 +6130,20 @@ "labelPercentage": 0, "route": [ { - "x": 752.5000000000001, - "y": 2586 + "x": 400.29761904761915, + "y": 2086 }, { - "x": 752.5000000000001, - "y": 2826 + "x": 400.29761904761915, + "y": 2522 }, { - "x": 452, - "y": 2826 + "x": 691.654761904762, + "y": 2522 }, { - "x": 452, - "y": 3362 + "x": 691.654761904762, + "y": 2662 } ], "animated": false, @@ -6112,20 +6176,20 @@ "labelPercentage": 0, "route": [ { - "x": 213.5, - "y": 2586 + "x": 1728.321428571429, + "y": 2086 }, { - "x": 213.5, - "y": 2626 + "x": 1728.321428571429, + "y": 2176 }, { - "x": 257.16666666666674, - "y": 2626 + "x": 1674.5476190476193, + "y": 2176 }, { - "x": 257.16666666666674, - "y": 3116 + "x": 1674.5476190476193, + "y": 2366 } ], "animated": false, @@ -6158,20 +6222,20 @@ "labelPercentage": 0, "route": [ { - "x": 230.5, - "y": 3182 + "x": 1701.2142857142858, + "y": 2432 }, { - "x": 230.5, - "y": 3222 + "x": 1701.2142857142858, + "y": 2472 }, { - "x": 177.5, - "y": 3222 + "x": 1753.2142857142858, + "y": 2472 }, { - "x": 177.5, - "y": 3362 + "x": 1753.2142857142858, + "y": 2662 } ], "animated": false, @@ -6204,12 +6268,12 @@ "labelPercentage": 0, "route": [ { - "x": 132, - "y": 3428 + "x": 1813.321428571429, + "y": 2728 }, { - "x": 132, - "y": 3708 + "x": 1813.321428571429, + "y": 2908 } ], "animated": false, @@ -6242,12 +6306,12 @@ "labelPercentage": 0, "route": [ { - "x": 618.5, - "y": 2040 + "x": 1319.654761904762, + "y": 1740 }, { - "x": 618.5, - "y": 2520 + "x": 1319.654761904762, + "y": 2020 } ], "animated": false, @@ -6280,20 +6344,20 @@ "labelPercentage": 0, "route": [ { - "x": 618.5, - "y": 2586 + "x": 1319.654761904762, + "y": 2086 }, { - "x": 618.5, - "y": 2626 + "x": 1319.654761904762, + "y": 2226 }, { - "x": 664.3690476190477, - "y": 2626 + "x": 1265.154761904762, + "y": 2226 }, { - "x": 664.3690476190477, - "y": 3116 + "x": 1265.154761904762, + "y": 2366 } ], "animated": false, @@ -6326,12 +6390,12 @@ "labelPercentage": 0, "route": [ { - "x": 716.3690476190476, - "y": 3182 + "x": 1244.654761904762, + "y": 2432 }, { - "x": 716.3690476190476, - "y": 3362 + "x": 1244.654761904762, + "y": 2662 } ], "animated": false, @@ -6364,12 +6428,12 @@ "labelPercentage": 0, "route": [ { - "x": 1572.25, - "y": 1694 + "x": 766.3214285714287, + "y": 1494 }, { - "x": 1572.25, - "y": 1974 + "x": 766.3214285714287, + "y": 1674 } ], "animated": false, @@ -6402,20 +6466,20 @@ "labelPercentage": 0, "route": [ { - "x": 929.1666666666667, - "y": 1694 + "x": 1180.321428571429, + "y": 1494 }, { - "x": 929.1666666666667, - "y": 1734 + "x": 1180.321428571429, + "y": 2126 }, { - "x": 368.1666666666665, - "y": 1734 + "x": 1574.5476190476193, + "y": 2126 }, { - "x": 368.1666666666665, - "y": 3116 + "x": 1574.5476190476193, + "y": 2366 } ], "animated": false, @@ -6448,20 +6512,20 @@ "labelPercentage": 0, "route": [ { - "x": 270.5, - "y": 3182 + "x": 1624.5476190476193, + "y": 2432 }, { - "x": 270.5, - "y": 3518 + "x": 1624.5476190476193, + "y": 2768 }, { - "x": 555.3690476190476, - "y": 3518 + "x": 1327.3214285714284, + "y": 2768 }, { - "x": 555.3690476190476, - "y": 3708 + "x": 1327.3214285714284, + "y": 2908 } ], "animated": false, @@ -6494,20 +6558,20 @@ "labelPercentage": 0, "route": [ { - "x": 785.8333333333334, - "y": 2586 + "x": 433.6309523809525, + "y": 2086 }, { - "x": 785.8333333333334, - "y": 2876 + "x": 433.6309523809525, + "y": 2472 }, { - "x": 483.3690476190475, - "y": 2876 + "x": 723.654761904762, + "y": 2472 }, { - "x": 483.3690476190475, - "y": 3362 + "x": 723.654761904762, + "y": 2662 } ], "animated": false, @@ -6540,12 +6604,28 @@ "labelPercentage": 0, "route": [ { - "x": 1777.8333333333333, - "y": 2040 + "x": 125.57142857142867, + "y": 1740 }, { - "x": 1777.8333333333333, - "y": 3362 + "x": 125.57142857142867, + "y": 1980 + }, + { + "x": 269.2380952380954, + "y": 1980 + }, + { + "x": 269.2380952380954, + "y": 2472 + }, + { + "x": 222.57142857142873, + "y": 2472 + }, + { + "x": 222.57142857142873, + "y": 2662 } ], "animated": false, @@ -6578,20 +6658,20 @@ "labelPercentage": 0, "route": [ { - "x": 307.16666666666674, - "y": 3182 + "x": 1646.7142857142858, + "y": 2432 }, { - "x": 307.16666666666674, - "y": 3468 + "x": 1646.7142857142858, + "y": 2818 }, { - "x": 588.7023809523808, - "y": 3468 + "x": 1360.654761904762, + "y": 2818 }, { - "x": 588.7023809523808, - "y": 3708 + "x": 1360.654761904762, + "y": 2908 } ], "animated": false, @@ -6624,28 +6704,28 @@ "labelPercentage": 0, "route": [ { - "x": 1572.25, - "y": 2040 + "x": 699.654761904762, + "y": 1740 }, { - "x": 1572.25, - "y": 2430 + "x": 699.654761904762, + "y": 1930 }, { - "x": 1481.4166666666667, - "y": 2430 + "x": 859.654761904762, + "y": 1930 }, { - "x": 1481.4166666666667, - "y": 3568 + "x": 859.654761904762, + "y": 2868 }, { - "x": 1549.4285714285716, - "y": 3568 + "x": 478.1190476190477, + "y": 2868 }, { - "x": 1549.4285714285716, - "y": 3708 + "x": 478.1190476190477, + "y": 2908 } ], "animated": false, @@ -6678,12 +6758,12 @@ "labelPercentage": 0, "route": [ { - "x": 748.3690476190477, - "y": 3182 + "x": 1276.654761904762, + "y": 2432 }, { - "x": 748.3690476190476, - "y": 3362 + "x": 1276.654761904762, + "y": 2662 } ], "animated": false, @@ -6716,12 +6796,20 @@ "labelPercentage": 0, "route": [ { - "x": 1618, - "y": 3182 + "x": 132, + "y": 2432 }, { - "x": 1618, - "y": 3708 + "x": 132, + "y": 2522 + }, + { + "x": 375.26190476190493, + "y": 2522 + }, + { + "x": 375.26190476190493, + "y": 2908 } ], "animated": false, @@ -6754,20 +6842,12 @@ "labelPercentage": 0, "route": [ { - "x": 740.3690476190476, - "y": 3428 + "x": 1293.9880952380954, + "y": 2728 }, { - "x": 740.3690476190476, - "y": 3568 - }, - { - "x": 688.7023809523808, - "y": 3568 - }, - { - "x": 688.7023809523808, - "y": 3708 + "x": 1293.9880952380954, + "y": 2908 } ], "animated": false, diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index 1f0ad1c94..3f369c94c 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-2489150183 .fill-N1{fill:#0A0F25;} + .d2-2489150183 .fill-N2{fill:#676C7E;} + .d2-2489150183 .fill-N3{fill:#9499AB;} + .d2-2489150183 .fill-N4{fill:#CFD2DD;} + .d2-2489150183 .fill-N5{fill:#DEE1EB;} + .d2-2489150183 .fill-N6{fill:#EEF1F8;} + .d2-2489150183 .fill-N7{fill:#FFFFFF;} + .d2-2489150183 .fill-B1{fill:#0D32B2;} + .d2-2489150183 .fill-B2{fill:#0D32B2;} + .d2-2489150183 .fill-B3{fill:#E3E9FD;} + .d2-2489150183 .fill-B4{fill:#E3E9FD;} + .d2-2489150183 .fill-B5{fill:#EDF0FD;} + .d2-2489150183 .fill-B6{fill:#F7F8FE;} + .d2-2489150183 .fill-AA2{fill:#4A6FF3;} + .d2-2489150183 .fill-AA4{fill:#EDF0FD;} + .d2-2489150183 .fill-AA5{fill:#F7F8FE;} + .d2-2489150183 .fill-AB4{fill:#EDF0FD;} + .d2-2489150183 .fill-AB5{fill:#F7F8FE;} + .d2-2489150183 .stroke-N1{stroke:#0A0F25;} + .d2-2489150183 .stroke-N2{stroke:#676C7E;} + .d2-2489150183 .stroke-N3{stroke:#9499AB;} + .d2-2489150183 .stroke-N4{stroke:#CFD2DD;} + .d2-2489150183 .stroke-N5{stroke:#DEE1EB;} + .d2-2489150183 .stroke-N6{stroke:#EEF1F8;} + .d2-2489150183 .stroke-N7{stroke:#FFFFFF;} + .d2-2489150183 .stroke-B1{stroke:#0D32B2;} + .d2-2489150183 .stroke-B2{stroke:#0D32B2;} + .d2-2489150183 .stroke-B3{stroke:#E3E9FD;} + .d2-2489150183 .stroke-B4{stroke:#E3E9FD;} + .d2-2489150183 .stroke-B5{stroke:#EDF0FD;} + .d2-2489150183 .stroke-B6{stroke:#F7F8FE;} + .d2-2489150183 .stroke-AA2{stroke:#4A6FF3;} + .d2-2489150183 .stroke-AA4{stroke:#EDF0FD;} + .d2-2489150183 .stroke-AA5{stroke:#F7F8FE;} + .d2-2489150183 .stroke-AB4{stroke:#EDF0FD;} + .d2-2489150183 .stroke-AB5{stroke:#F7F8FE;} + .d2-2489150183 .background-color-N1{background-color:#0A0F25;} + .d2-2489150183 .background-color-N2{background-color:#676C7E;} + .d2-2489150183 .background-color-N3{background-color:#9499AB;} + .d2-2489150183 .background-color-N4{background-color:#CFD2DD;} + .d2-2489150183 .background-color-N5{background-color:#DEE1EB;} + .d2-2489150183 .background-color-N6{background-color:#EEF1F8;} + .d2-2489150183 .background-color-N7{background-color:#FFFFFF;} + .d2-2489150183 .background-color-B1{background-color:#0D32B2;} + .d2-2489150183 .background-color-B2{background-color:#0D32B2;} + .d2-2489150183 .background-color-B3{background-color:#E3E9FD;} + .d2-2489150183 .background-color-B4{background-color:#E3E9FD;} + .d2-2489150183 .background-color-B5{background-color:#EDF0FD;} + .d2-2489150183 .background-color-B6{background-color:#F7F8FE;} + .d2-2489150183 .background-color-AA2{background-color:#4A6FF3;} + .d2-2489150183 .background-color-AA4{background-color:#EDF0FD;} + .d2-2489150183 .background-color-AA5{background-color:#F7F8FE;} + .d2-2489150183 .background-color-AB4{background-color:#EDF0FD;} + .d2-2489150183 .background-color-AB5{background-color:#F7F8FE;} + .d2-2489150183 .color-N1{color:#0A0F25;} + .d2-2489150183 .color-N2{color:#676C7E;} + .d2-2489150183 .color-N3{color:#9499AB;} + .d2-2489150183 .color-N4{color:#CFD2DD;} + .d2-2489150183 .color-N5{color:#DEE1EB;} + .d2-2489150183 .color-N6{color:#EEF1F8;} + .d2-2489150183 .color-N7{color:#FFFFFF;} + .d2-2489150183 .color-B1{color:#0D32B2;} + .d2-2489150183 .color-B2{color:#0D32B2;} + .d2-2489150183 .color-B3{color:#E3E9FD;} + .d2-2489150183 .color-B4{color:#E3E9FD;} + .d2-2489150183 .color-B5{color:#EDF0FD;} + .d2-2489150183 .color-B6{color:#F7F8FE;} + .d2-2489150183 .color-AA2{color:#4A6FF3;} + .d2-2489150183 .color-AA4{color:#EDF0FD;} + .d2-2489150183 .color-AA5{color:#F7F8FE;} + .d2-2489150183 .color-AB4{color:#EDF0FD;} + .d2-2489150183 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index 0a1dbee0c..06b748c37 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -8,7 +8,7 @@ "type": "rectangle", "pos": { "x": 12, - "y": 909 + "y": 859 }, "width": 546, "height": 902, @@ -49,7 +49,7 @@ "type": "rectangle", "pos": { "x": 62, - "y": 959 + "y": 909 }, "width": 246, "height": 413, @@ -90,7 +90,7 @@ "type": "stored_data", "pos": { "x": 120, - "y": 1009 + "y": 959 }, "width": 130, "height": 66, @@ -131,7 +131,7 @@ "type": "rectangle", "pos": { "x": 112, - "y": 1256 + "y": 1206 }, "width": 146, "height": 66, @@ -172,7 +172,7 @@ "type": "rectangle", "pos": { "x": 328, - "y": 964 + "y": 914 }, "width": 180, "height": 169, @@ -213,7 +213,7 @@ "type": "hexagon", "pos": { "x": 378, - "y": 1014 + "y": 964 }, "width": 80, "height": 69, @@ -254,7 +254,7 @@ "type": "rectangle", "pos": { "x": 85, - "y": 1543 + "y": 1493 }, "width": 199, "height": 218, @@ -295,7 +295,7 @@ "type": "cylinder", "pos": { "x": 135, - "y": 1593 + "y": 1543 }, "width": 99, "height": 118, @@ -335,7 +335,7 @@ "id": "user", "type": "person", "pos": { - "x": 248, + "x": 193, "y": 175 }, "width": 130, @@ -376,8 +376,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 508, - "y": 222 + "x": 389, + "y": 1916 }, "width": 116, "height": 66, @@ -417,8 +417,8 @@ "id": "logs", "type": "page", "pos": { - "x": 638, - "y": 909 + "x": 411, + "y": 2143 }, "width": 73, "height": 87, @@ -458,7 +458,7 @@ "id": "users", "type": "sql_table", "pos": { - "x": 645, + "x": 343, "y": 42 }, "width": 208, @@ -642,7 +642,7 @@ "id": "products", "type": "class", "pos": { - "x": 873, + "x": 571, "y": 12 }, "width": 242, @@ -706,7 +706,7 @@ "id": "markdown", "type": "text", "pos": { - "x": 1135, + "x": 879, "y": 169 }, "width": 97, @@ -746,8 +746,8 @@ "id": "code", "type": "code", "pos": { - "x": 749, - "y": 418 + "x": 493, + "y": 368 }, "width": 868, "height": 406, @@ -786,8 +786,8 @@ "id": "ex", "type": "text", "pos": { - "x": 981, - "y": 909 + "x": 725, + "y": 859 }, "width": 404, "height": 52, @@ -850,11 +850,11 @@ "route": [ { "x": 141, - "y": 1075 + "y": 1025 }, { "x": 141, - "y": 1256 + "y": 1206 } ], "animated": false, @@ -888,11 +888,11 @@ "route": [ { "x": 185, - "y": 1075 + "y": 1025 }, { "x": 185, - "y": 1256 + "y": 1206 } ], "animated": false, @@ -926,11 +926,11 @@ "route": [ { "x": 229, - "y": 1075 + "y": 1025 }, { "x": 229, - "y": 1256 + "y": 1206 } ], "animated": false, @@ -964,11 +964,11 @@ "route": [ { "x": 185, - "y": 1322 + "y": 1272 }, { "x": 185, - "y": 1593 + "y": 1543 } ], "animated": false, @@ -1001,20 +1001,20 @@ "labelPercentage": 0, "route": [ { - "x": 291, + "x": 237, "y": 262 }, { - "x": 291.41666666666663, + "x": 236.66666666666666, "y": 328 }, { - "x": 202.08333333333337, + "x": 190.75, "y": 328 }, { - "x": 202.08333333333337, - "y": 959 + "x": 190.75, + "y": 909 } ], "animated": false, @@ -1047,20 +1047,20 @@ "labelPercentage": 0, "route": [ { - "x": 335, + "x": 280, "y": 262 }, { - "x": 334.74999999999994, - "y": 328 + "x": 280, + "y": 814 }, { - "x": 389.5, - "y": 328 + "x": 404.6666666666667, + "y": 814 }, { - "x": 389, - "y": 1028 + "x": 405, + "y": 964 } ], "animated": false, @@ -1093,20 +1093,28 @@ "labelPercentage": 0, "route": [ { - "x": 538, - "y": 288 + "x": 466.83333333333337, + "y": 1916 }, { - "x": 538, - "y": 864 + "x": 466.83333333333337, + "y": 1876 + }, + { + "x": 680.75, + "y": 1876 + }, + { + "x": 680.75, + "y": 814 }, { "x": 431.33333333333337, - "y": 864 + "y": 814 }, { "x": 431, - "y": 1014 + "y": 964 } ], "animated": false, @@ -1139,20 +1147,12 @@ "labelPercentage": 0, "route": [ { - "x": 596, - "y": 288 + "x": 447.5, + "y": 1982 }, { - "x": 596, - "y": 328 - }, - { - "x": 674.5, - "y": 328 - }, - { - "x": 675, - "y": 909 + "x": 448, + "y": 2143 } ], "animated": false, @@ -1186,27 +1186,19 @@ "route": [ { "x": 135.5, - "y": 1761 + "y": 1711 }, { "x": 135.5, - "y": 1856 + "y": 1876 }, { - "x": 598, - "y": 1856 + "x": 428.1666666666667, + "y": 1876 }, { - "x": 598, - "y": 378 - }, - { - "x": 567, - "y": 378 - }, - { - "x": 567, - "y": 288 + "x": 428.1666666666667, + "y": 1916 } ], "animated": false, @@ -1239,12 +1231,12 @@ "labelPercentage": 0, "route": [ { - "x": 1183.5, + "x": 927.75, "y": 288 }, { - "x": 1183.5, - "y": 418 + "x": 927.75, + "y": 368 } ], "animated": false, @@ -1277,12 +1269,12 @@ "labelPercentage": 0, "route": [ { - "x": 1183.5, - "y": 824 + "x": 927.75, + "y": 774 }, { - "x": 1183.5, - "y": 909 + "x": 927.75, + "y": 859 } ], "animated": false, diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index c6b65163f..32e986e26 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

+networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

A tale

  • of
  • two cities
-
package main +
package main import (     "fmt" @@ -885,7 +885,7 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}package main +}package main import (     "fmt" @@ -908,14 +908,14 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/origami/elk/board.exp.json b/e2etests/testdata/themes/origami/elk/board.exp.json index e0471c167..f7575d3d9 100644 --- a/e2etests/testdata/themes/origami/elk/board.exp.json +++ b/e2etests/testdata/themes/origami/elk/board.exp.json @@ -343,7 +343,7 @@ "id": "user", "type": "person", "pos": { - "x": 343, + "x": 249, "y": 12 }, "width": 130, @@ -385,7 +385,7 @@ "id": "other-user", "type": "person", "pos": { - "x": 511, + "x": 399, "y": 19 }, "width": 108, @@ -427,8 +427,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 669, - "y": 59 + "x": 373, + "y": 1368 }, "width": 151, "height": 66, @@ -469,8 +469,8 @@ "id": "logs", "type": "page", "pos": { - "x": 784, - "y": 311 + "x": 406, + "y": 1595 }, "width": 84, "height": 87, @@ -681,19 +681,19 @@ "labelPercentage": 0, "route": [ { - "x": 387, + "x": 292, "y": 99 }, { - "x": 386.5833333333333, + "x": 292.41666666666663, "y": 165 }, { - "x": 260.3333333333333, + "x": 159.91666666666666, "y": 165 }, { - "x": 260.3333333333333, + "x": 159.91666666666666, "y": 361 } ], @@ -726,20 +726,20 @@ "labelPercentage": 0, "route": [ { - "x": 430, + "x": 336, "y": 99 }, { - "x": 429.91666666666663, + "x": 335.75, "y": 165 }, { - "x": 483.16666666666663, + "x": 468.2499999999999, "y": 165 }, { - "x": 483, - "y": 416 + "x": 468, + "y": 431 } ], "animated": false, @@ -771,11 +771,19 @@ "labelPercentage": 0, "route": [ { - "x": 706.75, - "y": 125 + "x": 473.66666666666663, + "y": 1368 }, { - "x": 706.75, + "x": 473.66666666666663, + "y": 1328 + }, + { + "x": 744, + "y": 1328 + }, + { + "x": 744, "y": 266 }, { @@ -816,20 +824,12 @@ "labelPercentage": 0, "route": [ { - "x": 782.25, - "y": 125 + "x": 448.5, + "y": 1434 }, { - "x": 782.25, - "y": 165 - }, - { - "x": 826.5, - "y": 165 - }, - { - "x": 827, - "y": 311 + "x": 449, + "y": 1595 } ], "animated": false, @@ -866,15 +866,15 @@ }, { "x": 153, - "y": 1258 + "y": 1328 }, { - "x": 744.5, - "y": 1258 + "x": 423.33333333333326, + "y": 1328 }, { - "x": 744.5, - "y": 125 + "x": 423.33333333333326, + "y": 1368 } ], "animated": false, diff --git a/e2etests/testdata/themes/origami/elk/sketch.exp.svg b/e2etests/testdata/themes/origami/elk/sketch.exp.svg index 2adc2a09c..5f1ab8891 100644 --- a/e2etests/testdata/themes/origami/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -