From b31f8720c7d9f6ddecfab46a86aed58287ba71d8 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:20:41 +0000 Subject: [PATCH] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 172 +- .../txtar/cycle-diagram/elk/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 172 +- 5 files changed, 1843 insertions(+), 2659 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 81f94c153..b0692943f 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -12,7 +12,7 @@ import ( ) const ( - MIN_RADIUS = 200 + MIN_RADIUS = 100 PADDING = 20 MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffe..b5f4f083e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 453, - "height": 466, + "width": 253, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -233 + "y": -133 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 173, + "x": 73, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 167 + "y": 67 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -227, + "x": -127, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 513, - "y": 50 + "x": 313, + "y": 25 }, - "width": 399, - "height": 366, + "width": 226, + "height": 216, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 486, - "y": -183 + "x": 286, + "y": -108 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 659, - "y": 116 + "x": 373, + "y": 41 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 313, - "y": 117 + "x": 199, + "y": 42 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 972, + "x": 599, "y": 0 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 945, - "y": -233 + "x": 572, + "y": -133 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 945, - "y": 167 + "x": 572, + "y": 67 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 + "y": -96.4229965209961 }, { - "x": 28.18000030517578, - "y": -198.00399780273438 + "x": 27.89900016784668, + "y": -96.02899932861328 }, { - "x": 31.285999298095703, - "y": -197.53700256347656 + "x": 29.40399932861328, + "y": -95.5790023803711 }, { - "x": 34.3849983215332, - "y": -197.02099609375 + "x": 30.900999069213867, + "y": -95.1050033569336 }, { - "x": 37.47600173950195, - "y": -196.45700073242188 + "x": 32.39099884033203, + "y": -94.60800170898438 }, { - "x": 40.55699920654297, - "y": -195.843994140625 + "x": 33.87300109863281, + "y": -94.08799743652344 }, { - "x": 43.62799835205078, - "y": -195.18299865722656 + "x": 35.34700012207031, + "y": -93.54399871826172 }, { - "x": 46.68899917602539, - "y": -194.47300720214844 + "x": 36.8120002746582, + "y": -92.97699737548828 }, { - "x": 49.73699951171875, - "y": -193.71600341796875 + "x": 38.268001556396484, + "y": -92.38700103759766 }, { - "x": 52.77399826049805, - "y": -192.91099548339844 + "x": 39.7140007019043, + "y": -91.7750015258789 }, { - "x": 55.79800033569336, - "y": -192.05799865722656 + "x": 41.1510009765625, + "y": -91.13999938964844 }, { - "x": 58.80799865722656, - "y": -191.1580047607422 + "x": 42.57699966430664, + "y": -90.48200225830078 }, { - "x": 61.803001403808594, - "y": -190.21099853515625 + "x": 43.99300003051758, + "y": -89.802001953125 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 45.39899826049805, + "y": -89.0999984741211 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 46.79199981689453, + "y": -88.3759994506836 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 + "x": 48.17499923706055, + "y": -87.62999725341797 }, { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 49.54499816894531, + "y": -86.86299896240234 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 50.90399932861328, + "y": -86.0739974975586 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 + "x": 52.249000549316406, + "y": -85.26399993896484 }, { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 53.582000732421875, + "y": -84.43199920654297 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 54.902000427246094, + "y": -83.58000183105469 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 56.20800018310547, + "y": -82.70800018310547 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 57.5, + "y": -81.81400299072266 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 + "x": 58.77799987792969, + "y": -80.9010009765625 }, { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 60.04199981689453, + "y": -79.96800231933594 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 61.290000915527344, + "y": -79.01499938964844 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 62.52399826049805, + "y": -78.04299926757812 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 63.742000579833984, + "y": -77.0510025024414 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 64.94400024414062, + "y": -76.04000091552734 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 66.13099670410156, + "y": -75.01100158691406 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 + "x": 67.3010025024414, + "y": -73.96299743652344 }, { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 68.4540023803711, + "y": -72.89600372314453 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 69.59100341796875, + "y": -71.81199645996094 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 + "x": 70.70999908447266, + "y": -70.70999908447266 }, { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 71.81199645996094, + "y": -69.59100341796875 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 72.89600372314453, + "y": -68.4540023803711 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 73.96299743652344, + "y": -67.3010025024414 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 75.01100158691406, + "y": -66.13099670410156 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 76.04000091552734, + "y": -64.94400024414062 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 77.0510025024414, + "y": -63.742000579833984 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 + "x": 78.04299926757812, + "y": -62.52399826049805 }, { - "x": 139.1820068359375, - "y": -143.625 + "x": 79.01499938964844, + "y": -61.290000915527344 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 79.96800231933594, + "y": -60.04199981689453 }, { - "x": 143.625, - "y": -139.1820068359375 + "x": 80.9010009765625, + "y": -58.77799987792969 }, { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 81.81400299072266, + "y": -57.5 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 82.70800018310547, + "y": -56.20800018310547 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 83.58000183105469, + "y": -54.902000427246094 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 84.43199920654297, + "y": -53.582000732421875 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 85.26399993896484, + "y": -52.249000549316406 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 86.0739974975586, + "y": -50.90399932861328 }, { - "x": 158.031005859375, - "y": -122.58100128173828 + "x": 86.86299896240234, + "y": -49.54499816894531 }, { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 87.62999725341797, + "y": -48.17499923706055 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 88.3759994506836, + "y": -46.79199981689453 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 89.0999984741211, + "y": -45.39899826049805 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 89.802001953125, + "y": -43.99300003051758 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 + "x": 90.48200225830078, + "y": -42.57699966430664 }, { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 91.13999938964844, + "y": -41.1510009765625 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 91.7750015258789, + "y": -39.7140007019043 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 + "x": 92.38700103759766, + "y": -38.268001556396484 }, { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 92.97699737548828, + "y": -36.8120002746582 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 93.54399871826172, + "y": -35.34700012207031 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 94.08799743652344, + "y": -33.87300109863281 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 - }, - { - "x": 179.60499572753906, - "y": -87.98699951171875 - }, - { - "x": 180.96499633789062, - "y": -85.15499877929688 - }, - { - "x": 182.27999877929688, - "y": -82.302001953125 - }, - { - "x": 183.5500030517578, - "y": -79.42900085449219 - }, - { - "x": 184.77499389648438, - "y": -76.53600311279297 - }, - { - "x": 185.9550018310547, - "y": -73.6240005493164 - }, - { - "x": 187.08799743652344, - "y": -70.69400024414062 - }, - { - "x": 188.17599487304688, - "y": -67.74700164794922 - }, - { - "x": 189.2169952392578, - "y": -64.78299713134766 - }, - { - "x": 190.21099853515625, - "y": -61.803001403808594 - }, - { - "x": 191.1580047607422, - "y": -58.80799865722656 - }, - { - "x": 192.05799865722656, - "y": -55.79800033569336 - }, - { - "x": 192.91099548339844, - "y": -52.77399826049805 - }, - { - "x": 193.71600341796875, - "y": -49.73699951171875 - }, - { - "x": 194.47300720214844, - "y": -46.68899917602539 - }, - { - "x": 195.18299865722656, - "y": -43.62799835205078 - }, - { - "x": 195.843994140625, - "y": -40.55699920654297 - }, - { - "x": 196.45700073242188, - "y": -37.47600173950195 - }, - { - "x": 197.02099609375, - "y": -34.3849983215332 - }, - { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": -33 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 + "x": 94.08799743652344, + "y": 33.87300109863281 }, { - "x": 196.45700073242188, - "y": 37.47600173950195 + "x": 93.54399871826172, + "y": 35.34700012207031 }, { - "x": 195.843994140625, - "y": 40.55699920654297 + "x": 92.97699737548828, + "y": 36.8120002746582 }, { - "x": 195.18299865722656, - "y": 43.62799835205078 + "x": 92.38700103759766, + "y": 38.268001556396484 }, { - "x": 194.47300720214844, - "y": 46.68899917602539 + "x": 91.7750015258789, + "y": 39.7140007019043 }, { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 91.13999938964844, + "y": 41.1510009765625 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 90.48200225830078, + "y": 42.57699966430664 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 89.802001953125, + "y": 43.99300003051758 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 89.0999984741211, + "y": 45.39899826049805 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 88.3759994506836, + "y": 46.79199981689453 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 87.62999725341797, + "y": 48.17499923706055 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 86.86299896240234, + "y": 49.54499816894531 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 86.0739974975586, + "y": 50.90399932861328 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 85.26399993896484, + "y": 52.249000549316406 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 84.43199920654297, + "y": 53.582000732421875 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 83.58000183105469, + "y": 54.902000427246094 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 82.70800018310547, + "y": 56.20800018310547 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 81.81400299072266, + "y": 57.5 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 80.9010009765625, + "y": 58.77799987792969 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 79.96800231933594, + "y": 60.04199981689453 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 79.01499938964844, + "y": 61.290000915527344 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 78.04299926757812, + "y": 62.52399826049805 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 77.0510025024414, + "y": 63.742000579833984 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 76.04000091552734, + "y": 64.94400024414062 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 75.01100158691406, + "y": 66.13099670410156 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 73.96299743652344, + "y": 67.3010025024414 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 72.89600372314453, + "y": 68.4540023803711 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 71.81199645996094, + "y": 69.59100341796875 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 70.70999908447266, + "y": 70.70999908447266 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 69.59100341796875, + "y": 71.81199645996094 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 68.4540023803711, + "y": 72.89600372314453 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 67.3010025024414, + "y": 73.96299743652344 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 66.13099670410156, + "y": 75.01100158691406 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 64.94400024414062, + "y": 76.04000091552734 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 63.742000579833984, + "y": 77.0510025024414 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 62.52399826049805, + "y": 78.04299926757812 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 61.290000915527344, + "y": 79.01499938964844 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 60.04199981689453, + "y": 79.96800231933594 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 58.77799987792969, + "y": 80.9010009765625 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 57.5, + "y": 81.81400299072266 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 56.20800018310547, + "y": 82.70800018310547 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 54.902000427246094, + "y": 83.58000183105469 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 53.582000732421875, + "y": 84.43199920654297 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 52.249000549316406, + "y": 85.26399993896484 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 50.90399932861328, + "y": 86.0739974975586 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 49.54499816894531, + "y": 86.86299896240234 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 48.17499923706055, + "y": 87.62999725341797 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 46.79199981689453, + "y": 88.3759994506836 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 45.39899826049805, + "y": 89.0999984741211 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 43.99300003051758, + "y": 89.802001953125 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 42.57699966430664, + "y": 90.48200225830078 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 41.1510009765625, + "y": 91.13999938964844 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 39.7140007019043, + "y": 91.7750015258789 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 38.268001556396484, + "y": 92.38700103759766 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 36.8120002746582, + "y": 92.97699737548828 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 35.34700012207031, + "y": 93.54399871826172 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 33.87300109863281, + "y": 94.08799743652344 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 32.39099884033203, + "y": 94.60800170898438 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 30.900999069213867, + "y": 95.1050033569336 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 29.40399932861328, + "y": 95.5790023803711 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 - }, - { - "x": 85.15499877929688, - "y": 180.96499633789062 - }, - { - "x": 82.302001953125, - "y": 182.27999877929688 - }, - { - "x": 79.42900085449219, - "y": 183.5500030517578 - }, - { - "x": 76.53600311279297, - "y": 184.77499389648438 - }, - { - "x": 73.6240005493164, - "y": 185.9550018310547 - }, - { - "x": 70.69400024414062, - "y": 187.08799743652344 - }, - { - "x": 67.74700164794922, - "y": 188.17599487304688 - }, - { - "x": 64.78299713134766, - "y": 189.2169952392578 - }, - { - "x": 61.803001403808594, - "y": 190.21099853515625 - }, - { - "x": 58.80799865722656, - "y": 191.1580047607422 - }, - { - "x": 55.79800033569336, - "y": 192.05799865722656 - }, - { - "x": 52.77399826049805, - "y": 192.91099548339844 - }, - { - "x": 49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": 46.68899917602539, - "y": 194.47300720214844 - }, - { - "x": 43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": 40.55699920654297, - "y": 195.843994140625 - }, - { - "x": 37.47600173950195, - "y": 196.45700073242188 - }, - { - "x": 34.3849983215332, - "y": 197.02099609375 - }, - { - "x": 31.285999298095703, - "y": 197.53700256347656 - }, - { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 27.89900016784668, + "y": 96.02899932861328 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 96.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 + "y": 96.4229965209961 }, { - "x": -28.18000030517578, - "y": 198.00399780273438 + "x": -27.89900016784668, + "y": 96.02899932861328 }, { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": -29.40399932861328, + "y": 95.5790023803711 }, { - "x": -34.3849983215332, - "y": 197.02099609375 + "x": -30.900999069213867, + "y": 95.1050033569336 }, { - "x": -37.47600173950195, - "y": 196.45700073242188 + "x": -32.39099884033203, + "y": 94.60800170898438 }, { - "x": -40.55699920654297, - "y": 195.843994140625 + "x": -33.87300109863281, + "y": 94.08799743652344 }, { - "x": -43.62799835205078, - "y": 195.18299865722656 + "x": -35.34700012207031, + "y": 93.54399871826172 }, { - "x": -46.68899917602539, - "y": 194.47300720214844 + "x": -36.8120002746582, + "y": 92.97699737548828 }, { - "x": -49.73699951171875, - "y": 193.71600341796875 + "x": -38.268001556396484, + "y": 92.38700103759766 }, { - "x": -52.77399826049805, - "y": 192.91099548339844 + "x": -39.7140007019043, + "y": 91.7750015258789 }, { - "x": -55.79800033569336, - "y": 192.05799865722656 + "x": -41.1510009765625, + "y": 91.13999938964844 }, { - "x": -58.80799865722656, - "y": 191.1580047607422 + "x": -42.57699966430664, + "y": 90.48200225830078 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -43.99300003051758, + "y": 89.802001953125 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -45.39899826049805, + "y": 89.0999984741211 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -46.79199981689453, + "y": 88.3759994506836 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 + "x": -48.17499923706055, + "y": 87.62999725341797 }, { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -49.54499816894531, + "y": 86.86299896240234 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -50.90399932861328, + "y": 86.0739974975586 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 + "x": -52.249000549316406, + "y": 85.26399993896484 }, { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -53.582000732421875, + "y": 84.43199920654297 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -54.902000427246094, + "y": 83.58000183105469 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -56.20800018310547, + "y": 82.70800018310547 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -57.5, + "y": 81.81400299072266 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -58.77799987792969, + "y": 80.9010009765625 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -60.04199981689453, + "y": 79.96800231933594 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 + "x": -61.290000915527344, + "y": 79.01499938964844 }, { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -62.52399826049805, + "y": 78.04299926757812 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -63.742000579833984, + "y": 77.0510025024414 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -64.94400024414062, + "y": 76.04000091552734 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -66.13099670410156, + "y": 75.01100158691406 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 + "x": -67.3010025024414, + "y": 73.96299743652344 }, { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -68.4540023803711, + "y": 72.89600372314453 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -69.59100341796875, + "y": 71.81199645996094 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 + "x": -70.70999908447266, + "y": 70.70999908447266 }, { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -71.81199645996094, + "y": 69.59100341796875 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -72.89600372314453, + "y": 68.4540023803711 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -73.96299743652344, + "y": 67.3010025024414 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -75.01100158691406, + "y": 66.13099670410156 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -76.04000091552734, + "y": 64.94400024414062 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -77.0510025024414, + "y": 63.742000579833984 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 + "x": -78.04299926757812, + "y": 62.52399826049805 }, { - "x": -139.1820068359375, - "y": 143.625 + "x": -79.01499938964844, + "y": 61.290000915527344 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -79.96800231933594, + "y": 60.04199981689453 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -80.9010009765625, + "y": 58.77799987792969 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -81.81400299072266, + "y": 57.5 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 + "x": -82.70800018310547, + "y": 56.20800018310547 }, { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -83.58000183105469, + "y": 54.902000427246094 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -84.43199920654297, + "y": 53.582000732421875 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 + "x": -85.26399993896484, + "y": 52.249000549316406 }, { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -86.0739974975586, + "y": 50.90399932861328 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -86.86299896240234, + "y": 49.54499816894531 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -87.62999725341797, + "y": 48.17499923706055 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -88.3759994506836, + "y": 46.79199981689453 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -89.0999984741211, + "y": 45.39899826049805 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -89.802001953125, + "y": 43.99300003051758 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 + "x": -90.48200225830078, + "y": 42.57699966430664 }, { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -91.13999938964844, + "y": 41.1510009765625 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -91.7750015258789, + "y": 39.7140007019043 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 + "x": -92.38700103759766, + "y": 38.268001556396484 }, { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -92.97699737548828, + "y": 36.8120002746582 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -93.54399871826172, + "y": 35.34700012207031 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -94.08799743652344, + "y": 33.87300109863281 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 - }, - { - "x": -179.60499572753906, - "y": 87.98699951171875 - }, - { - "x": -180.96499633789062, - "y": 85.15499877929688 - }, - { - "x": -182.27999877929688, - "y": 82.302001953125 - }, - { - "x": -183.5500030517578, - "y": 79.42900085449219 - }, - { - "x": -184.77499389648438, - "y": 76.53600311279297 - }, - { - "x": -185.9550018310547, - "y": 73.6240005493164 - }, - { - "x": -187.08799743652344, - "y": 70.69400024414062 - }, - { - "x": -188.17599487304688, - "y": 67.74700164794922 - }, - { - "x": -189.2169952392578, - "y": 64.78299713134766 - }, - { - "x": -190.21099853515625, - "y": 61.803001403808594 - }, - { - "x": -191.1580047607422, - "y": 58.80799865722656 - }, - { - "x": -192.05799865722656, - "y": 55.79800033569336 - }, - { - "x": -192.91099548339844, - "y": 52.77399826049805 - }, - { - "x": -193.71600341796875, - "y": 49.73699951171875 - }, - { - "x": -194.47300720214844, - "y": 46.68899917602539 - }, - { - "x": -195.18299865722656, - "y": 43.62799835205078 - }, - { - "x": -195.843994140625, - "y": 40.55699920654297 - }, - { - "x": -196.45700073242188, - "y": 37.47600173950195 - }, - { - "x": -197.02099609375, - "y": 34.3849983215332 - }, - { - "x": -197.2519989013672, + "x": -94.39399719238281, "y": 33 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 + "x": 339.5, + "y": -71.4209976196289 }, { - "x": 542.2160034179688, - "y": -147.85400390625 + "x": 339.8909912109375, + "y": -71.31600189208984 }, { - "x": 546.35302734375, - "y": -147.19900512695312 + "x": 341.90301513671875, + "y": -70.73100280761719 }, { - "x": 550.4760131835938, - "y": -146.45700073242188 + "x": 343.9010009765625, + "y": -70.1050033569336 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 345.885986328125, + "y": -69.43699645996094 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 347.85699462890625, + "y": -68.72799682617188 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 349.81201171875, + "y": -67.97699737548828 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 + "x": 351.7510070800781, + "y": -67.18599700927734 }, { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 353.6730041503906, + "y": -66.35399627685547 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 355.5769958496094, + "y": -65.48200225830078 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 357.4630126953125, + "y": -64.57099914550781 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 359.3290100097656, + "y": -63.619998931884766 }, { - "x": 586.6240234375, - "y": -135.9550018310547 + "x": 361.17498779296875, + "y": -62.630001068115234 }, { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 363, + "y": -61.60200119018555 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 364.802001953125, + "y": -60.5359992980957 }, { - "x": 598.155029296875, - "y": -130.96499633789062 + "x": 366.5820007324219, + "y": -59.43199920654297 }, { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 368.3389892578125, + "y": -58.29199981689453 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 370.0710144042969, + "y": -57.11399841308594 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 371.77801513671875, + "y": -55.9010009765625 }, { - "x": 613, - "y": -123.20500183105469 + "x": 373.4590148925781, + "y": -54.652000427246094 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 375.114013671875, + "y": -53.36899948120117 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 376.74200439453125, + "y": -52.05099868774414 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 378.3420104980469, + "y": -50.69900131225586 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 379.9129943847656, + "y": -49.31399917602539 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 381.4540100097656, + "y": -47.895999908447266 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 382.96600341796875, + "y": -46.446998596191406 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 384.4469909667969, + "y": -44.965999603271484 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 385.89599609375, + "y": -43.45399856567383 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 387.3139953613281, + "y": -41.91299819946289 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 388.6990051269531, + "y": -40.34199905395508 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 390.0509948730469, + "y": -38.742000579833984 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 391.3689880371094, + "y": -37.11399841308594 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 392.6520080566406, + "y": -35.45899963378906 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 393.9010009765625, + "y": -33.77799987792969 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 395.114013671875, + "y": -32.07099914550781 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 396.2919921875, + "y": -30.339000701904297 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 397.4320068359375, + "y": -28.582000732421875 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 398.5360107421875, + "y": -26.802000045776367 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 399.60198974609375, + "y": -25 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 400.6300048828125, + "y": -23.174999237060547 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 401.6199951171875, + "y": -21.32900047302246 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 402.5710144042969, + "y": -19.46299934387207 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 403.48199462890625, + "y": -17.57699966430664 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 404.35400390625, + "y": -15.67300033569336 }, { - "x": 686.2050170898438, - "y": -50 + "x": 405.1860046386719, + "y": -13.75100040435791 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 405.97698974609375, + "y": -11.812000274658203 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 406.7279968261719, + "y": -9.857000350952148 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 407.43701171875, + "y": -7.886000156402588 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 408.1050109863281, + "y": -5.901000022888184 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 408.7309875488281, + "y": -3.9030001163482666 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 409.3160095214844, + "y": -1.8910000324249268 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 409.8580017089844, + "y": 0.13099999725818634 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 410.35699462890625, + "y": 2.1640000343322754 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 410.8139953613281, + "y": 4.208000183105469 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 411.2279968261719, + "y": 6.261000156402588 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 411.5989990234375, + "y": 8.322999954223633 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 411.927001953125, + "y": 10.390999794006348 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 412.21099853515625, + "y": 12.465999603271484 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 412.4519958496094, + "y": 14.54699993133545 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 412.64898681640625, + "y": 16.631999969482422 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 412.802001953125, + "y": 18.719999313354492 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 412.9119873046875, + "y": 20.812000274658203 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 412.9779968261719, + "y": 22.905000686645508 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 413, + "y": 25 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 412.9779968261719, + "y": 27.0939998626709 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 412.9119873046875, + "y": 29.187000274658203 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 412.802001953125, + "y": 31.27899932861328 }, { - "x": 712.823974609375, - "y": 41.624000549316406 + "x": 412.64898681640625, + "y": 33.367000579833984 }, { - "x": 712.9559936523438, - "y": 45.81100082397461 + "x": 412.4519958496094, + "y": 35.45199966430664 }, { - "x": 713, - "y": 50 + "x": 412.21099853515625, + "y": 37.53300094604492 }, { - "x": 712.9559936523438, - "y": 54.1879997253418 + "x": 411.927001953125, + "y": 39.608001708984375 }, { - "x": 712.823974609375, - "y": 58.375 + "x": 411.5989990234375, + "y": 41.67599868774414 }, { - "x": 712.60498046875, - "y": 62.55799865722656 - }, - { - "x": 712.2979736328125, - "y": 66.73500061035156 - }, - { - "x": 711.9039916992188, - "y": 70.90499877929688 - }, - { - "x": 711.4219970703125, - "y": 75.06600189208984 - }, - { - "x": 710.85400390625, - "y": 79.21600341796875 - }, - { - "x": 710.198974609375, - "y": 83.35299682617188 - }, - { - "x": 709.4569702148438, - "y": 87.47599792480469 - }, - { - "x": 708.6290283203125, - "y": 91.58200073242188 - }, - { - "x": 707.7150268554688, - "y": 95.66999816894531 - }, - { - "x": 706.7160034179688, - "y": 99.73699951171875 - }, - { - "x": 705.6320190429688, - "y": 103.78299713134766 - }, - { - "x": 704.4630126953125, - "y": 107.80599975585938 - }, - { - "x": 703.2109985351562, - "y": 111.8030014038086 - }, - { - "x": 701.875, - "y": 115.77300262451172 - }, - { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 411.5409851074219, + "y": 41.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 + "x": 373.10198974609375, + "y": 104.91799926757812 }, { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 371.77801513671875, + "y": 105.9010009765625 }, { - "x": 658.7930297851562, - "y": 186.90899658203125 + "x": 370.0710144042969, + "y": 107.11399841308594 }, { - "x": 655.8939819335938, - "y": 189.9320068359375 + "x": 368.3389892578125, + "y": 108.29199981689453 }, { - "x": 652.9320068359375, - "y": 192.8939971923828 + "x": 366.5820007324219, + "y": 109.43199920654297 }, { - "x": 649.9089965820312, - "y": 195.79299926757812 + "x": 364.802001953125, + "y": 110.53600311279297 }, { - "x": 646.8259887695312, - "y": 198.6280059814453 + "x": 363, + "y": 111.60199737548828 }, { - "x": 643.6840209960938, - "y": 201.3990020751953 + "x": 361.17498779296875, + "y": 112.62999725341797 }, { - "x": 640.4840087890625, - "y": 204.1020050048828 + "x": 359.3290100097656, + "y": 113.62000274658203 }, { - "x": 637.22900390625, - "y": 206.73800659179688 + "x": 357.4630126953125, + "y": 114.57099914550781 }, { - "x": 633.9190063476562, - "y": 209.30499267578125 + "x": 355.5769958496094, + "y": 115.48200225830078 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 353.6730041503906, + "y": 116.35399627685547 }, { - "x": 627.1420288085938, - "y": 214.22900390625 + "x": 351.7510070800781, + "y": 117.18599700927734 }, { - "x": 623.677978515625, - "y": 216.58399963378906 + "x": 349.81201171875, + "y": 117.97699737548828 }, { - "x": 620.1649780273438, - "y": 218.86500549316406 + "x": 347.85699462890625, + "y": 118.72799682617188 }, { - "x": 616.60498046875, - "y": 221.07200622558594 + "x": 345.885986328125, + "y": 119.43699645996094 }, { - "x": 613, - "y": 223.2050018310547 + "x": 343.9010009765625, + "y": 120.1050033569336 }, { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 341.90301513671875, + "y": 120.73100280761719 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 339.8909912109375, + "y": 121.31600189208984 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 337.8680114746094, + "y": 121.85800170898438 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 335.8349914550781, + "y": 122.35700225830078 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 333.7909851074219, + "y": 122.81400299072266 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 331.7380065917969, + "y": 123.22799682617188 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 329.6759948730469, + "y": 123.5989990234375 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 327.6080017089844, + "y": 123.927001953125 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 325.5329895019531, + "y": 124.21099853515625 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 323.4519958496094, + "y": 124.4520034790039 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 321.36700439453125, + "y": 124.64900207519531 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 319.27899169921875, + "y": 124.802001953125 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 317.18701171875, + "y": 124.91200256347656 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 315.093994140625, + "y": 124.97799682617188 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 313, + "y": 125 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 310.9049987792969, + "y": 124.97799682617188 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 308.81201171875, + "y": 124.91200256347656 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 306.7200012207031, + "y": 124.802001953125 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 304.6319885253906, + "y": 124.64900207519531 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 302.5469970703125, + "y": 124.4520034790039 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 300.46600341796875, + "y": 124.21099853515625 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 298.3909912109375, + "y": 123.927001953125 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 296.322998046875, + "y": 123.5989990234375 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 294.260986328125, + "y": 123.22799682617188 }, { - "x": 513, - "y": 250 + "x": 292.2080078125, + "y": 122.81400299072266 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 290.16400146484375, + "y": 122.35700225830078 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 288.1310119628906, + "y": 121.85800170898438 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 286.1080017089844, + "y": 121.31600189208984 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 284.09600830078125, + "y": 120.73100280761719 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 282.0979919433594, + "y": 120.1050033569336 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 280.1130065917969, + "y": 119.43699645996094 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 278.1419982910156, + "y": 118.72799682617188 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 276.18701171875, + "y": 117.97699737548828 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 274.24798583984375, + "y": 117.18599700927734 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 272.32598876953125, + "y": 116.35399627685547 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 270.4219970703125, + "y": 115.48200225830078 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 268.5360107421875, + "y": 114.57099914550781 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 266.6700134277344, + "y": 113.62000274658203 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 264.8240051269531, + "y": 112.62999725341797 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 263, + "y": 111.60199737548828 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 261.1969909667969, + "y": 110.53600311279297 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 259.4169921875, + "y": 109.43199920654297 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 257.6600036621094, + "y": 108.29199981689453 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 255.92799377441406, + "y": 107.11399841308594 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 254.2209930419922, + "y": 105.9010009765625 }, { - "x": 427.843994140625, - "y": 230.96499633789062 - }, - { - "x": 424.0719909667969, - "y": 229.14199829101562 - }, - { - "x": 420.3399963378906, - "y": 227.24000549316406 - }, - { - "x": 416.64898681640625, - "y": 225.26100158691406 - }, - { - "x": 413, - "y": 223.2050018310547 - }, - { - "x": 409.3940124511719, - "y": 221.07200622558594 - }, - { - "x": 405.8340148925781, - "y": 218.86500549316406 - }, - { - "x": 402.3210144042969, - "y": 216.58399963378906 - }, - { - "x": 398.85699462890625, - "y": 214.22900390625 - }, - { - "x": 395.4419860839844, - "y": 211.80299377441406 - }, - { - "x": 392.0799865722656, - "y": 209.30499267578125 - }, - { - "x": 388.7699890136719, - "y": 206.73800659179688 - }, - { - "x": 385.5150146484375, - "y": 204.1020050048828 - }, - { - "x": 382.31500244140625, - "y": 201.3990020751953 - }, - { - "x": 379.1730041503906, - "y": 198.6280059814453 - }, - { - "x": 376.0899963378906, - "y": 195.79299926757812 - }, - { - "x": 373.0669860839844, - "y": 192.8939971923828 - }, - { - "x": 370.1050109863281, - "y": 189.9320068359375 - }, - { - "x": 367.20599365234375, - "y": 186.90899658203125 - }, - { - "x": 364.3710021972656, - "y": 183.8260040283203 - }, - { - "x": 363.6419982910156, - "y": 183 + "x": 252.89700317382812, + "y": 104.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 + "x": 625.5, + "y": -96.41200256347656 }, { - "x": 1003.2860107421875, - "y": -197.53700256347656 + "x": 626.8989868164062, + "y": -96.02899932861328 }, { - "x": 1009.4760131835938, - "y": -196.45700073242188 + "x": 629.9010009765625, + "y": -95.1050033569336 }, { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 632.8729858398438, + "y": -94.08799743652344 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 635.81201171875, + "y": -92.97699737548828 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 638.7139892578125, + "y": -91.7750015258789 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 641.5770263671875, + "y": -90.48200225830078 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 644.3989868164062, + "y": -89.0999984741211 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 647.1749877929688, + "y": -87.62999725341797 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 649.9039916992188, + "y": -86.0739974975586 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 652.5819702148438, + "y": -84.43199920654297 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 655.2080078125, + "y": -82.70800018310547 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 657.7780151367188, + "y": -80.9010009765625 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 660.2899780273438, + "y": -79.01499938964844 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 662.7420043945312, + "y": -77.0510025024414 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 665.1309814453125, + "y": -75.01100158691406 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 667.4539794921875, + "y": -72.89600372314453 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 669.7100219726562, + "y": -70.70999908447266 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 671.89599609375, + "y": -68.4540023803711 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 674.010986328125, + "y": -66.13099670410156 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 676.051025390625, + "y": -63.742000579833984 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 678.0150146484375, + "y": -61.290000915527344 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 679.9010009765625, + "y": -58.77799987792969 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 681.7080078125, + "y": -56.20800018310547 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 683.4320068359375, + "y": -53.582000732421875 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 685.073974609375, + "y": -50.90399932861328 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 686.6300048828125, + "y": -48.17499923706055 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 688.0999755859375, + "y": -45.39899826049805 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 689.4819946289062, + "y": -42.57699966430664 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 690.7750244140625, + "y": -39.7140007019043 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 691.9769897460938, + "y": -36.8120002746582 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 693.0880126953125, + "y": -33.87300109863281 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 694.10498046875, + "y": -30.900999069213867 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 695.0289916992188, + "y": -27.89900016784668 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 695.8579711914062, + "y": -24.868000030517578 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 696.5910034179688, + "y": -21.81399917602539 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 697.22802734375, + "y": -18.738000869750977 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 697.7680053710938, + "y": -15.642999649047852 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 698.2109985351562, + "y": -12.532999992370605 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 698.5560302734375, + "y": -9.40999984741211 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 698.802001953125, + "y": -6.2789998054504395 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 698.9500122070312, + "y": -3.1410000324249268 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 - }, - { - "x": 1171.112060546875, - "y": -18.820999145507812 - }, - { - "x": 1171.60498046875, - "y": -12.557999610900879 - }, - { - "x": 1171.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 1172, + "x": 699, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 + "x": 698.9500122070312, + "y": 3.1410000324249268 }, { - "x": 1171.60498046875, - "y": 12.557999610900879 + "x": 698.802001953125, + "y": 6.2789998054504395 }, { - "x": 1171.112060546875, - "y": 18.820999145507812 + "x": 698.5560302734375, + "y": 9.40999984741211 }, { - "x": 1170.4219970703125, - "y": 25.06599998474121 + "x": 698.2109985351562, + "y": 12.532999992370605 }, { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 697.7680053710938, + "y": 15.642999649047852 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 697.22802734375, + "y": 18.738000869750977 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 696.5910034179688, + "y": 21.81399917602539 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 695.8579711914062, + "y": 24.868000030517578 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 695.0289916992188, + "y": 27.89900016784668 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 694.10498046875, + "y": 30.900999069213867 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 693.0880126953125, + "y": 33.87300109863281 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 691.9769897460938, + "y": 36.8120002746582 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 690.7750244140625, + "y": 39.7140007019043 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 689.4819946289062, + "y": 42.57699966430664 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 688.0999755859375, + "y": 45.39899826049805 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 686.6300048828125, + "y": 48.17499923706055 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 685.073974609375, + "y": 50.90399932861328 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 683.4320068359375, + "y": 53.582000732421875 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 681.7080078125, + "y": 56.20800018310547 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 679.9010009765625, + "y": 58.77799987792969 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 678.0150146484375, + "y": 61.290000915527344 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 676.051025390625, + "y": 63.742000579833984 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 674.010986328125, + "y": 66.13099670410156 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 671.89599609375, + "y": 68.4540023803711 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 669.7100219726562, + "y": 70.70999908447266 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 667.4539794921875, + "y": 72.89600372314453 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 665.1309814453125, + "y": 75.01100158691406 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 662.7420043945312, + "y": 77.0510025024414 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 660.2899780273438, + "y": 79.01499938964844 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 657.7780151367188, + "y": 80.9010009765625 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 655.2080078125, + "y": 82.70800018310547 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 652.5819702148438, + "y": 84.43199920654297 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 649.9039916992188, + "y": 86.0739974975586 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 647.1749877929688, + "y": 87.62999725341797 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 644.3989868164062, + "y": 89.0999984741211 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 641.5770263671875, + "y": 90.48200225830078 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 638.7139892578125, + "y": 91.7750015258789 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 635.81201171875, + "y": 92.97699737548828 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 632.8729858398438, + "y": 94.08799743652344 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 629.9010009765625, + "y": 95.1050033569336 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 626.8989868164062, + "y": 96.02899932861328 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 - }, - { - "x": 1015.6279907226562, - "y": 195.18299865722656 - }, - { - "x": 1009.4760131835938, - "y": 196.45700073242188 - }, - { - "x": 1003.2860107421875, - "y": 197.53700256347656 - }, - { - "x": 998.5, - "y": 198.21800231933594 + "x": 625.5, + "y": 96.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d74..beb13e80b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-910961565 .fill-N1{fill:#0A0F25;} + .d2-910961565 .fill-N2{fill:#676C7E;} + .d2-910961565 .fill-N3{fill:#9499AB;} + .d2-910961565 .fill-N4{fill:#CFD2DD;} + .d2-910961565 .fill-N5{fill:#DEE1EB;} + .d2-910961565 .fill-N6{fill:#EEF1F8;} + .d2-910961565 .fill-N7{fill:#FFFFFF;} + .d2-910961565 .fill-B1{fill:#0D32B2;} + .d2-910961565 .fill-B2{fill:#0D32B2;} + .d2-910961565 .fill-B3{fill:#E3E9FD;} + .d2-910961565 .fill-B4{fill:#E3E9FD;} + .d2-910961565 .fill-B5{fill:#EDF0FD;} + .d2-910961565 .fill-B6{fill:#F7F8FE;} + .d2-910961565 .fill-AA2{fill:#4A6FF3;} + .d2-910961565 .fill-AA4{fill:#EDF0FD;} + .d2-910961565 .fill-AA5{fill:#F7F8FE;} + .d2-910961565 .fill-AB4{fill:#EDF0FD;} + .d2-910961565 .fill-AB5{fill:#F7F8FE;} + .d2-910961565 .stroke-N1{stroke:#0A0F25;} + .d2-910961565 .stroke-N2{stroke:#676C7E;} + .d2-910961565 .stroke-N3{stroke:#9499AB;} + .d2-910961565 .stroke-N4{stroke:#CFD2DD;} + .d2-910961565 .stroke-N5{stroke:#DEE1EB;} + .d2-910961565 .stroke-N6{stroke:#EEF1F8;} + .d2-910961565 .stroke-N7{stroke:#FFFFFF;} + .d2-910961565 .stroke-B1{stroke:#0D32B2;} + .d2-910961565 .stroke-B2{stroke:#0D32B2;} + .d2-910961565 .stroke-B3{stroke:#E3E9FD;} + .d2-910961565 .stroke-B4{stroke:#E3E9FD;} + .d2-910961565 .stroke-B5{stroke:#EDF0FD;} + .d2-910961565 .stroke-B6{stroke:#F7F8FE;} + .d2-910961565 .stroke-AA2{stroke:#4A6FF3;} + .d2-910961565 .stroke-AA4{stroke:#EDF0FD;} + .d2-910961565 .stroke-AA5{stroke:#F7F8FE;} + .d2-910961565 .stroke-AB4{stroke:#EDF0FD;} + .d2-910961565 .stroke-AB5{stroke:#F7F8FE;} + .d2-910961565 .background-color-N1{background-color:#0A0F25;} + .d2-910961565 .background-color-N2{background-color:#676C7E;} + .d2-910961565 .background-color-N3{background-color:#9499AB;} + .d2-910961565 .background-color-N4{background-color:#CFD2DD;} + .d2-910961565 .background-color-N5{background-color:#DEE1EB;} + .d2-910961565 .background-color-N6{background-color:#EEF1F8;} + .d2-910961565 .background-color-N7{background-color:#FFFFFF;} + .d2-910961565 .background-color-B1{background-color:#0D32B2;} + .d2-910961565 .background-color-B2{background-color:#0D32B2;} + .d2-910961565 .background-color-B3{background-color:#E3E9FD;} + .d2-910961565 .background-color-B4{background-color:#E3E9FD;} + .d2-910961565 .background-color-B5{background-color:#EDF0FD;} + .d2-910961565 .background-color-B6{background-color:#F7F8FE;} + .d2-910961565 .background-color-AA2{background-color:#4A6FF3;} + .d2-910961565 .background-color-AA4{background-color:#EDF0FD;} + .d2-910961565 .background-color-AA5{background-color:#F7F8FE;} + .d2-910961565 .background-color-AB4{background-color:#EDF0FD;} + .d2-910961565 .background-color-AB5{background-color:#F7F8FE;} + .d2-910961565 .color-N1{color:#0A0F25;} + .d2-910961565 .color-N2{color:#676C7E;} + .d2-910961565 .color-N3{color:#9499AB;} + .d2-910961565 .color-N4{color:#CFD2DD;} + .d2-910961565 .color-N5{color:#DEE1EB;} + .d2-910961565 .color-N6{color:#EEF1F8;} + .d2-910961565 .color-N7{color:#FFFFFF;} + .d2-910961565 .color-B1{color:#0D32B2;} + .d2-910961565 .color-B2{color:#0D32B2;} + .d2-910961565 .color-B3{color:#E3E9FD;} + .d2-910961565 .color-B4{color:#E3E9FD;} + .d2-910961565 .color-B5{color:#EDF0FD;} + .d2-910961565 .color-B6{color:#F7F8FE;} + .d2-910961565 .color-AA2{color:#4A6FF3;} + .d2-910961565 .color-AA4{color:#EDF0FD;} + .d2-910961565 .color-AA5{color:#F7F8FE;} + .d2-910961565 .color-AB4{color:#EDF0FD;} + .d2-910961565 .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-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-910961565);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-910961565);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-910961565);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-910961565);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a84..d78744f1e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 454, - "height": 466, + "width": 254, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -221 + "y": -121 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 185, + "x": 85, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 179 + "y": 79 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -215, + "x": -115, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 485, - "y": 61 + "x": 285, + "y": 36 }, - "width": 400, - "height": 367, + "width": 227, + "height": 217, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 459, - "y": -171 + "x": 259, + "y": -96 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 632, - "y": 128 + "x": 345, + "y": 53 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 285, - "y": 129 + "x": 172, + "y": 54 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 904, + "x": 531, "y": 12 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 878, - "y": -221 + "x": 505, + "y": -121 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 878, - "y": 179 + "x": 505, + "y": 79 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 + "y": -84.4229965209961 }, { - "x": 40.18000030517578, - "y": -186.00399780273438 + "x": 39.89899826049805, + "y": -84.02899932861328 }, { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 41.40399932861328, + "y": -83.5790023803711 }, { - "x": 46.3849983215332, - "y": -185.02099609375 + "x": 42.9010009765625, + "y": -83.1050033569336 }, { - "x": 49.47600173950195, - "y": -184.45700073242188 + "x": 44.39099884033203, + "y": -82.60800170898438 }, { - "x": 52.55699920654297, - "y": -183.843994140625 + "x": 45.87300109863281, + "y": -82.08799743652344 }, { - "x": 55.62799835205078, - "y": -183.18299865722656 + "x": 47.34700012207031, + "y": -81.54399871826172 }, { - "x": 58.68899917602539, - "y": -182.47300720214844 + "x": 48.8120002746582, + "y": -80.97699737548828 }, { - "x": 61.73699951171875, - "y": -181.71600341796875 + "x": 50.268001556396484, + "y": -80.38700103759766 }, { - "x": 64.77400207519531, - "y": -180.91099548339844 + "x": 51.7140007019043, + "y": -79.7750015258789 }, { - "x": 67.7979965209961, - "y": -180.05799865722656 + "x": 53.1510009765625, + "y": -79.13999938964844 }, { - "x": 70.80799865722656, - "y": -179.1580047607422 + "x": 54.57699966430664, + "y": -78.48200225830078 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 55.99300003051758, + "y": -77.802001953125 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 57.39899826049805, + "y": -77.0999984741211 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 58.79199981689453, + "y": -76.3759994506836 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 60.17499923706055, + "y": -75.62999725341797 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 61.54499816894531, + "y": -74.86299896240234 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 62.90399932861328, + "y": -74.0739974975586 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 64.2490005493164, + "y": -73.26399993896484 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 65.58200073242188, + "y": -72.43199920654297 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 66.9020004272461, + "y": -71.58000183105469 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 68.20800018310547, + "y": -70.70800018310547 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 69.5, + "y": -69.81400299072266 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 70.77799987792969, + "y": -68.9010009765625 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 72.04199981689453, + "y": -67.96800231933594 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 73.29000091552734, + "y": -67.01499938964844 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 74.52400207519531, + "y": -66.04299926757812 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 75.74199676513672, + "y": -65.0510025024414 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 76.94400024414062, + "y": -64.04000091552734 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 78.13099670410156, + "y": -63.01100158691406 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 79.3010025024414, + "y": -61.9630012512207 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 80.4540023803711, + "y": -60.895999908447266 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 81.59100341796875, + "y": -59.8120002746582 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 82.70999908447266, + "y": -58.709999084472656 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 83.81199645996094, + "y": -57.590999603271484 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 84.89600372314453, + "y": -56.45399856567383 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 85.96299743652344, + "y": -55.30099868774414 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 87.01100158691406, + "y": -54.13100051879883 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 88.04000091552734, + "y": -52.944000244140625 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 89.0510025024414, + "y": -51.742000579833984 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 90.04299926757812, + "y": -50.52399826049805 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 91.01499938964844, + "y": -49.290000915527344 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 91.96800231933594, + "y": -48.04199981689453 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 92.9010009765625, + "y": -46.77799987792969 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 93.81400299072266, + "y": -45.5 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 94.70800018310547, + "y": -44.20800018310547 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 95.58000183105469, + "y": -42.902000427246094 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 96.43199920654297, + "y": -41.582000732421875 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 97.26399993896484, + "y": -40.249000549316406 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 98.0739974975586, + "y": -38.90399932861328 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 98.86299896240234, + "y": -37.54499816894531 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 99.62999725341797, + "y": -36.17499923706055 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 100.3759994506836, + "y": -34.79199981689453 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 101.0999984741211, + "y": -33.39899826049805 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 101.802001953125, + "y": -31.993000030517578 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 102.48200225830078, + "y": -30.57699966430664 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 103.13999938964844, + "y": -29.150999069213867 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 103.7750015258789, + "y": -27.714000701904297 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 104.38700103759766, + "y": -26.26799964904785 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 104.97699737548828, + "y": -24.812000274658203 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 105.54399871826172, + "y": -23.347000122070312 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 106.08799743652344, + "y": -21.87299919128418 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 - }, - { - "x": 191.60499572753906, - "y": -75.98699951171875 - }, - { - "x": 192.96499633789062, - "y": -73.15499877929688 - }, - { - "x": 194.27999877929688, - "y": -70.302001953125 - }, - { - "x": 195.5500030517578, - "y": -67.42900085449219 - }, - { - "x": 196.77499389648438, - "y": -64.53600311279297 - }, - { - "x": 197.9550018310547, - "y": -61.624000549316406 - }, - { - "x": 199.08799743652344, - "y": -58.694000244140625 - }, - { - "x": 200.17599487304688, - "y": -55.74700164794922 - }, - { - "x": 201.2169952392578, - "y": -52.78300094604492 - }, - { - "x": 202.21099853515625, - "y": -49.803001403808594 - }, - { - "x": 203.1580047607422, - "y": -46.80799865722656 - }, - { - "x": 204.05799865722656, - "y": -43.79800033569336 - }, - { - "x": 204.91099548339844, - "y": -40.77399826049805 - }, - { - "x": 205.71600341796875, - "y": -37.73699951171875 - }, - { - "x": 206.47300720214844, - "y": -34.68899917602539 - }, - { - "x": 207.18299865722656, - "y": -31.628000259399414 - }, - { - "x": 207.843994140625, - "y": -28.55699920654297 - }, - { - "x": 208.45700073242188, - "y": -25.47599983215332 - }, - { - "x": 209.02099609375, - "y": -22.385000228881836 - }, - { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": -21 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 + "x": 106.08799743652344, + "y": 45.87300109863281 }, { - "x": 208.45700073242188, - "y": 49.47600173950195 + "x": 105.54399871826172, + "y": 47.34700012207031 }, { - "x": 207.843994140625, - "y": 52.55699920654297 + "x": 104.97699737548828, + "y": 48.8120002746582 }, { - "x": 207.18299865722656, - "y": 55.62799835205078 + "x": 104.38700103759766, + "y": 50.268001556396484 }, { - "x": 206.47300720214844, - "y": 58.68899917602539 + "x": 103.7750015258789, + "y": 51.7140007019043 }, { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 103.13999938964844, + "y": 53.1510009765625 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 102.48200225830078, + "y": 54.57699966430664 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 + "x": 101.802001953125, + "y": 55.99300003051758 }, { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 101.0999984741211, + "y": 57.39899826049805 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 100.3759994506836, + "y": 58.79199981689453 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 + "x": 99.62999725341797, + "y": 60.17499923706055 }, { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 98.86299896240234, + "y": 61.54499816894531 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 98.0739974975586, + "y": 62.90399932861328 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 97.26399993896484, + "y": 64.2490005493164 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 96.43199920654297, + "y": 65.58200073242188 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 95.58000183105469, + "y": 66.9020004272461 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 94.70800018310547, + "y": 68.20800018310547 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 + "x": 93.81400299072266, + "y": 69.5 }, { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 92.9010009765625, + "y": 70.77799987792969 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 91.96800231933594, + "y": 72.04199981689453 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 91.01499938964844, + "y": 73.29000091552734 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 90.04299926757812, + "y": 74.52400207519531 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 + "x": 89.0510025024414, + "y": 75.74199676513672 }, { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 88.04000091552734, + "y": 76.94400024414062 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 87.01100158691406, + "y": 78.13099670410156 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 + "x": 85.96299743652344, + "y": 79.3010025024414 }, { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 84.89600372314453, + "y": 80.4540023803711 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 83.81199645996094, + "y": 81.59100341796875 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 82.70999908447266, + "y": 82.70999908447266 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 81.59100341796875, + "y": 83.81199645996094 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 80.4540023803711, + "y": 84.89600372314453 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 79.3010025024414, + "y": 85.96299743652344 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 + "x": 78.13099670410156, + "y": 87.01100158691406 }, { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 76.94400024414062, + "y": 88.04000091552734 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 75.74199676513672, + "y": 89.0510025024414 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 + "x": 74.52400207519531, + "y": 90.04299926757812 }, { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 73.29000091552734, + "y": 91.01499938964844 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 72.04199981689453, + "y": 91.96800231933594 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 70.77799987792969, + "y": 92.9010009765625 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 69.5, + "y": 93.81400299072266 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 68.20800018310547, + "y": 94.70800018310547 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 66.9020004272461, + "y": 95.58000183105469 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 + "x": 65.58200073242188, + "y": 96.43199920654297 }, { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 64.2490005493164, + "y": 97.26399993896484 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 62.90399932861328, + "y": 98.0739974975586 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 + "x": 61.54499816894531, + "y": 98.86299896240234 }, { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 60.17499923706055, + "y": 99.62999725341797 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 58.79199981689453, + "y": 100.3759994506836 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 57.39899826049805, + "y": 101.0999984741211 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 55.99300003051758, + "y": 101.802001953125 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 + "x": 54.57699966430664, + "y": 102.48200225830078 }, { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 53.1510009765625, + "y": 103.13999938964844 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 51.7140007019043, + "y": 103.7750015258789 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 50.268001556396484, + "y": 104.38700103759766 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 48.8120002746582, + "y": 104.97699737548828 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 47.34700012207031, + "y": 105.54399871826172 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 45.87300109863281, + "y": 106.08799743652344 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 + "x": 44.39099884033203, + "y": 106.60800170898438 }, { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 42.9010009765625, + "y": 107.1050033569336 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 41.40399932861328, + "y": 107.5790023803711 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 - }, - { - "x": 97.15499877929688, - "y": 192.96499633789062 - }, - { - "x": 94.302001953125, - "y": 194.27999877929688 - }, - { - "x": 91.42900085449219, - "y": 195.5500030517578 - }, - { - "x": 88.53600311279297, - "y": 196.77499389648438 - }, - { - "x": 85.6240005493164, - "y": 197.9550018310547 - }, - { - "x": 82.69400024414062, - "y": 199.08799743652344 - }, - { - "x": 79.74700164794922, - "y": 200.17599487304688 - }, - { - "x": 76.78299713134766, - "y": 201.2169952392578 - }, - { - "x": 73.8030014038086, - "y": 202.21099853515625 - }, - { - "x": 70.80799865722656, - "y": 203.1580047607422 - }, - { - "x": 67.7979965209961, - "y": 204.05799865722656 - }, - { - "x": 64.77400207519531, - "y": 204.91099548339844 - }, - { - "x": 61.73699951171875, - "y": 205.71600341796875 - }, - { - "x": 58.68899917602539, - "y": 206.47300720214844 - }, - { - "x": 55.62799835205078, - "y": 207.18299865722656 - }, - { - "x": 52.55699920654297, - "y": 207.843994140625 - }, - { - "x": 49.47600173950195, - "y": 208.45700073242188 - }, - { - "x": 46.3849983215332, - "y": 209.02099609375 - }, - { - "x": 43.2859992980957, - "y": 209.53700256347656 - }, - { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 39.89899826049805, + "y": 108.02899932861328 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 108.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 + "y": 108.4229965209961 }, { - "x": -16.18000030517578, - "y": 210.00399780273438 + "x": -15.89900016784668, + "y": 108.02899932861328 }, { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": -17.40399932861328, + "y": 107.5790023803711 }, { - "x": -22.385000228881836, - "y": 209.02099609375 + "x": -18.900999069213867, + "y": 107.1050033569336 }, { - "x": -25.47599983215332, - "y": 208.45700073242188 + "x": -20.391000747680664, + "y": 106.60800170898438 }, { - "x": -28.55699920654297, - "y": 207.843994140625 + "x": -21.87299919128418, + "y": 106.08799743652344 }, { - "x": -31.628000259399414, - "y": 207.18299865722656 + "x": -23.347000122070312, + "y": 105.54399871826172 }, { - "x": -34.68899917602539, - "y": 206.47300720214844 + "x": -24.812000274658203, + "y": 104.97699737548828 }, { - "x": -37.73699951171875, - "y": 205.71600341796875 + "x": -26.26799964904785, + "y": 104.38700103759766 }, { - "x": -40.77399826049805, - "y": 204.91099548339844 + "x": -27.714000701904297, + "y": 103.7750015258789 }, { - "x": -43.79800033569336, - "y": 204.05799865722656 + "x": -29.150999069213867, + "y": 103.13999938964844 }, { - "x": -46.80799865722656, - "y": 203.1580047607422 + "x": -30.57699966430664, + "y": 102.48200225830078 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -31.993000030517578, + "y": 101.802001953125 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -33.39899826049805, + "y": 101.0999984741211 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -34.79199981689453, + "y": 100.3759994506836 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 + "x": -36.17499923706055, + "y": 99.62999725341797 }, { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -37.54499816894531, + "y": 98.86299896240234 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -38.90399932861328, + "y": 98.0739974975586 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 + "x": -40.249000549316406, + "y": 97.26399993896484 }, { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -41.582000732421875, + "y": 96.43199920654297 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -42.902000427246094, + "y": 95.58000183105469 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -44.20800018310547, + "y": 94.70800018310547 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -45.5, + "y": 93.81400299072266 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -46.77799987792969, + "y": 92.9010009765625 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -48.04199981689453, + "y": 91.96800231933594 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 + "x": -49.290000915527344, + "y": 91.01499938964844 }, { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -50.52399826049805, + "y": 90.04299926757812 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -51.742000579833984, + "y": 89.0510025024414 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -52.944000244140625, + "y": 88.04000091552734 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -54.13100051879883, + "y": 87.01100158691406 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 + "x": -55.30099868774414, + "y": 85.96299743652344 }, { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -56.45399856567383, + "y": 84.89600372314453 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -57.590999603271484, + "y": 83.81199645996094 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 + "x": -58.709999084472656, + "y": 82.70999908447266 }, { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -59.8120002746582, + "y": 81.59100341796875 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -60.895999908447266, + "y": 80.4540023803711 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -61.9630012512207, + "y": 79.3010025024414 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -63.01100158691406, + "y": 78.13099670410156 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -64.04000091552734, + "y": 76.94400024414062 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -65.0510025024414, + "y": 75.74199676513672 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 + "x": -66.04299926757812, + "y": 74.52400207519531 }, { - "x": -127.18199920654297, - "y": 155.625 + "x": -67.01499938964844, + "y": 73.29000091552734 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -67.96800231933594, + "y": 72.04199981689453 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -68.9010009765625, + "y": 70.77799987792969 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -69.81400299072266, + "y": 69.5 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 + "x": -70.70800018310547, + "y": 68.20800018310547 }, { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -71.58000183105469, + "y": 66.9020004272461 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -72.43199920654297, + "y": 65.58200073242188 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 + "x": -73.26399993896484, + "y": 64.2490005493164 }, { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -74.0739974975586, + "y": 62.90399932861328 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -74.86299896240234, + "y": 61.54499816894531 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -75.62999725341797, + "y": 60.17499923706055 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -76.3759994506836, + "y": 58.79199981689453 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -77.0999984741211, + "y": 57.39899826049805 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -77.802001953125, + "y": 55.99300003051758 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 + "x": -78.48200225830078, + "y": 54.57699966430664 }, { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -79.13999938964844, + "y": 53.1510009765625 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -79.7750015258789, + "y": 51.7140007019043 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 + "x": -80.38700103759766, + "y": 50.268001556396484 }, { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -80.97699737548828, + "y": 48.8120002746582 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -81.54399871826172, + "y": 47.34700012207031 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -82.08799743652344, + "y": 45.87300109863281 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 - }, - { - "x": -167.60499572753906, - "y": 99.98699951171875 - }, - { - "x": -168.96499633789062, - "y": 97.15499877929688 - }, - { - "x": -170.27999877929688, - "y": 94.302001953125 - }, - { - "x": -171.5500030517578, - "y": 91.42900085449219 - }, - { - "x": -172.77499389648438, - "y": 88.53600311279297 - }, - { - "x": -173.9550018310547, - "y": 85.6240005493164 - }, - { - "x": -175.08799743652344, - "y": 82.69400024414062 - }, - { - "x": -176.17599487304688, - "y": 79.74700164794922 - }, - { - "x": -177.2169952392578, - "y": 76.78299713134766 - }, - { - "x": -178.21099853515625, - "y": 73.8030014038086 - }, - { - "x": -179.1580047607422, - "y": 70.80799865722656 - }, - { - "x": -180.05799865722656, - "y": 67.7979965209961 - }, - { - "x": -180.91099548339844, - "y": 64.77400207519531 - }, - { - "x": -181.71600341796875, - "y": 61.73699951171875 - }, - { - "x": -182.47300720214844, - "y": 58.68899917602539 - }, - { - "x": -183.18299865722656, - "y": 55.62799835205078 - }, - { - "x": -183.843994140625, - "y": 52.55699920654297 - }, - { - "x": -184.45700073242188, - "y": 49.47600173950195 - }, - { - "x": -185.02099609375, - "y": 46.3849983215332 - }, - { - "x": -185.2519989013672, + "x": -82.39399719238281, "y": 45 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 + "x": 312, + "y": -59.42100143432617 }, { - "x": 514.7160034179688, - "y": -135.85400390625 + "x": 312.3909912109375, + "y": -59.316001892089844 }, { - "x": 518.85302734375, - "y": -135.19900512695312 + "x": 314.40301513671875, + "y": -58.73099899291992 }, { - "x": 522.9760131835938, - "y": -134.45700073242188 + "x": 316.4010009765625, + "y": -58.10499954223633 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 318.385986328125, + "y": -57.4370002746582 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 320.35699462890625, + "y": -56.72800064086914 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 322.31201171875, + "y": -55.97700119018555 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 + "x": 324.2510070800781, + "y": -55.18600082397461 }, { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 326.1730041503906, + "y": -54.354000091552734 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 328.0769958496094, + "y": -53.481998443603516 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 329.9630126953125, + "y": -52.57099914550781 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 331.8290100097656, + "y": -51.619998931884766 }, { - "x": 559.1240234375, - "y": -123.95500183105469 + "x": 333.67498779296875, + "y": -50.630001068115234 }, { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 335.5, + "y": -49.60200119018555 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 337.302001953125, + "y": -48.5359992980957 }, { - "x": 570.655029296875, - "y": -118.96499633789062 + "x": 339.0820007324219, + "y": -47.43199920654297 }, { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 340.8389892578125, + "y": -46.29199981689453 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 342.5710144042969, + "y": -45.11399841308594 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 344.27801513671875, + "y": -43.9010009765625 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 345.9590148925781, + "y": -42.652000427246094 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 347.614013671875, + "y": -41.36899948120117 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 349.24200439453125, + "y": -40.05099868774414 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 350.8420104980469, + "y": -38.69900131225586 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 352.4129943847656, + "y": -37.31399917602539 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 353.9540100097656, + "y": -35.895999908447266 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 355.46600341796875, + "y": -34.446998596191406 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 356.9469909667969, + "y": -32.965999603271484 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 358.39599609375, + "y": -31.45400047302246 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 359.8139953613281, + "y": -29.913000106811523 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 361.1990051269531, + "y": -28.341999053955078 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 362.5509948730469, + "y": -26.742000579833984 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 363.8689880371094, + "y": -25.11400032043457 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 365.1520080566406, + "y": -23.458999633789062 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 366.4010009765625, + "y": -21.777999877929688 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 367.614013671875, + "y": -20.070999145507812 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 368.7919921875, + "y": -18.339000701904297 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 369.9320068359375, + "y": -16.582000732421875 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 371.0360107421875, + "y": -14.802000045776367 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 372.10198974609375, + "y": -13 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 373.1300048828125, + "y": -11.175000190734863 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 374.1199951171875, + "y": -9.329000473022461 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 375.0710144042969, + "y": -7.4629998207092285 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 375.98199462890625, + "y": -5.577000141143799 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 376.85400390625, + "y": -3.6730000972747803 }, { - "x": 658.7050170898438, - "y": -38 + "x": 377.6860046386719, + "y": -1.7510000467300415 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 378.47698974609375, + "y": 0.18700000643730164 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 379.2279968261719, + "y": 2.1419999599456787 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 379.93701171875, + "y": 4.11299991607666 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 380.6050109863281, + "y": 6.0980000495910645 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 381.2309875488281, + "y": 8.095999717712402 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 381.8160095214844, + "y": 10.107999801635742 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 382.3580017089844, + "y": 12.130999565124512 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 382.85699462890625, + "y": 14.163999557495117 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 383.3139953613281, + "y": 16.20800018310547 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 383.7279968261719, + "y": 18.26099967956543 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 384.0989990234375, + "y": 20.322999954223633 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 384.427001953125, + "y": 22.391000747680664 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 384.71099853515625, + "y": 24.465999603271484 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 384.9519958496094, + "y": 26.547000885009766 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 385.14898681640625, + "y": 28.631999969482422 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 385.302001953125, + "y": 30.719999313354492 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 385.4119873046875, + "y": 32.8120002746582 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 385.4779968261719, + "y": 34.904998779296875 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 385.5, + "y": 36.999000549316406 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 385.4779968261719, + "y": 39.09400177001953 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 385.4119873046875, + "y": 41.1870002746582 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 385.302001953125, + "y": 43.27899932861328 }, { - "x": 685.323974609375, - "y": 53.624000549316406 + "x": 385.14898681640625, + "y": 45.367000579833984 }, { - "x": 685.4559936523438, - "y": 57.81100082397461 + "x": 384.9519958496094, + "y": 47.45199966430664 }, { - "x": 685.5, - "y": 61.999000549316406 + "x": 384.71099853515625, + "y": 49.53300094604492 }, { - "x": 685.4559936523438, - "y": 66.18800354003906 + "x": 384.427001953125, + "y": 51.608001708984375 }, { - "x": 685.323974609375, - "y": 70.375 + "x": 384.0989990234375, + "y": 53.67599868774414 }, { - "x": 685.10498046875, - "y": 74.55799865722656 - }, - { - "x": 684.7979736328125, - "y": 78.73500061035156 - }, - { - "x": 684.4039916992188, - "y": 82.90499877929688 - }, - { - "x": 683.9219970703125, - "y": 87.06600189208984 - }, - { - "x": 683.35400390625, - "y": 91.21600341796875 - }, - { - "x": 682.698974609375, - "y": 95.35299682617188 - }, - { - "x": 681.9569702148438, - "y": 99.47599792480469 - }, - { - "x": 681.1290283203125, - "y": 103.58200073242188 - }, - { - "x": 680.2150268554688, - "y": 107.66999816894531 - }, - { - "x": 679.2160034179688, - "y": 111.73699951171875 - }, - { - "x": 678.1320190429688, - "y": 115.78299713134766 - }, - { - "x": 676.9630126953125, - "y": 119.80599975585938 - }, - { - "x": 675.7109985351562, - "y": 123.8030014038086 - }, - { - "x": 674.375, - "y": 127.77300262451172 - }, - { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 384.0409851074219, + "y": 53.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 + "x": 345.60198974609375, + "y": 116.91799926757812 }, { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 344.27801513671875, + "y": 117.9010009765625 }, { - "x": 631.2930297851562, - "y": 198.90899658203125 + "x": 342.5710144042969, + "y": 119.11399841308594 }, { - "x": 628.3939819335938, - "y": 201.9320068359375 + "x": 340.8389892578125, + "y": 120.29199981689453 }, { - "x": 625.4320068359375, - "y": 204.8939971923828 + "x": 339.0820007324219, + "y": 121.43199920654297 }, { - "x": 622.4089965820312, - "y": 207.79299926757812 + "x": 337.302001953125, + "y": 122.53600311279297 }, { - "x": 619.3259887695312, - "y": 210.6280059814453 + "x": 335.5, + "y": 123.60199737548828 }, { - "x": 616.1840209960938, - "y": 213.3990020751953 + "x": 333.67498779296875, + "y": 124.62999725341797 }, { - "x": 612.9840087890625, - "y": 216.1020050048828 + "x": 331.8290100097656, + "y": 125.62000274658203 }, { - "x": 609.72900390625, - "y": 218.73800659179688 + "x": 329.9630126953125, + "y": 126.57099914550781 }, { - "x": 606.4190063476562, - "y": 221.30499267578125 + "x": 328.0769958496094, + "y": 127.48200225830078 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 326.1730041503906, + "y": 128.35400390625 }, { - "x": 599.6420288085938, - "y": 226.22900390625 + "x": 324.2510070800781, + "y": 129.18600463867188 }, { - "x": 596.177978515625, - "y": 228.58399963378906 + "x": 322.31201171875, + "y": 129.9770050048828 }, { - "x": 592.6649780273438, - "y": 230.86500549316406 + "x": 320.35699462890625, + "y": 130.72799682617188 }, { - "x": 589.10498046875, - "y": 233.07200622558594 + "x": 318.385986328125, + "y": 131.43699645996094 }, { - "x": 585.5, - "y": 235.2050018310547 + "x": 316.4010009765625, + "y": 132.10499572753906 }, { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 314.40301513671875, + "y": 132.7310028076172 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 312.3909912109375, + "y": 133.3159942626953 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 310.3680114746094, + "y": 133.85800170898438 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 308.3349914550781, + "y": 134.35699462890625 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 306.2909851074219, + "y": 134.81399536132812 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 304.2380065917969, + "y": 135.22799682617188 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 302.1759948730469, + "y": 135.5989990234375 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 300.1080017089844, + "y": 135.927001953125 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 298.0329895019531, + "y": 136.21099853515625 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 295.9519958496094, + "y": 136.45199584960938 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 293.86700439453125, + "y": 136.6490020751953 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 291.77899169921875, + "y": 136.802001953125 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 289.68701171875, + "y": 136.91200256347656 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 287.593994140625, + "y": 136.97799682617188 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 285.5, + "y": 137 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 283.4049987792969, + "y": 136.97799682617188 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 281.31201171875, + "y": 136.91200256347656 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 279.2200012207031, + "y": 136.802001953125 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 277.1319885253906, + "y": 136.6490020751953 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 275.0469970703125, + "y": 136.45199584960938 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 272.96600341796875, + "y": 136.21099853515625 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 270.8909912109375, + "y": 135.927001953125 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 268.822998046875, + "y": 135.5989990234375 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 266.760986328125, + "y": 135.22799682617188 }, { - "x": 485.5, - "y": 262 + "x": 264.7080078125, + "y": 134.81399536132812 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 262.66400146484375, + "y": 134.35699462890625 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 260.6310119628906, + "y": 133.85800170898438 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 258.6080017089844, + "y": 133.3159942626953 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 256.59600830078125, + "y": 132.7310028076172 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 254.59800720214844, + "y": 132.10499572753906 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 252.61300659179688, + "y": 131.43699645996094 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 250.64199829101562, + "y": 130.72799682617188 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 248.68699645996094, + "y": 129.9770050048828 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 246.7480010986328, + "y": 129.18600463867188 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 244.8260040283203, + "y": 128.35400390625 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 242.9219970703125, + "y": 127.48200225830078 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 241.03599548339844, + "y": 126.57099914550781 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 239.1699981689453, + "y": 125.62000274658203 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 237.32400512695312, + "y": 124.62999725341797 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 235.5, + "y": 123.60199737548828 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 233.69700622558594, + "y": 122.53600311279297 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 231.91700744628906, + "y": 121.43199920654297 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 230.16000366210938, + "y": 120.29199981689453 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 228.42799377441406, + "y": 119.11399841308594 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 226.7209930419922, + "y": 117.9010009765625 }, { - "x": 400.343994140625, - "y": 242.96499633789062 - }, - { - "x": 396.5719909667969, - "y": 241.14199829101562 - }, - { - "x": 392.8399963378906, - "y": 239.24000549316406 - }, - { - "x": 389.14898681640625, - "y": 237.26100158691406 - }, - { - "x": 385.5, - "y": 235.2050018310547 - }, - { - "x": 381.8940124511719, - "y": 233.07200622558594 - }, - { - "x": 378.3340148925781, - "y": 230.86500549316406 - }, - { - "x": 374.8210144042969, - "y": 228.58399963378906 - }, - { - "x": 371.35699462890625, - "y": 226.22900390625 - }, - { - "x": 367.9419860839844, - "y": 223.80299377441406 - }, - { - "x": 364.5799865722656, - "y": 221.30499267578125 - }, - { - "x": 361.2699890136719, - "y": 218.73800659179688 - }, - { - "x": 358.0150146484375, - "y": 216.1020050048828 - }, - { - "x": 354.81500244140625, - "y": 213.3990020751953 - }, - { - "x": 351.6730041503906, - "y": 210.6280059814453 - }, - { - "x": 348.5899963378906, - "y": 207.79299926757812 - }, - { - "x": 345.5669860839844, - "y": 204.8939971923828 - }, - { - "x": 342.6050109863281, - "y": 201.9320068359375 - }, - { - "x": 339.70599365234375, - "y": 198.90899658203125 - }, - { - "x": 336.8710021972656, - "y": 195.8260040283203 - }, - { - "x": 336.1419982910156, - "y": 195 + "x": 225.39700317382812, + "y": 116.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 + "x": 558.2050170898438, + "y": -84.41200256347656 }, { - "x": 936.197021484375, - "y": -185.53700256347656 + "x": 559.60400390625, + "y": -84.02899932861328 }, { - "x": 942.385986328125, - "y": -184.45700073242188 + "x": 562.6060180664062, + "y": -83.1050033569336 }, { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 565.5780029296875, + "y": -82.08799743652344 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 568.5170288085938, + "y": -80.97699737548828 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 571.4190063476562, + "y": -79.7750015258789 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 574.2830200195312, + "y": -78.48200225830078 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 577.10400390625, + "y": -77.0999984741211 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 579.8800048828125, + "y": -75.62999725341797 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 582.6090087890625, + "y": -74.0739974975586 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 585.2869873046875, + "y": -72.43199920654297 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 587.9130249023438, + "y": -70.70800018310547 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 590.4829711914062, + "y": -68.9010009765625 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 592.9949951171875, + "y": -67.01499938964844 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 595.447021484375, + "y": -65.0510025024414 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 597.8359985351562, + "y": -63.01100158691406 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 600.1589965820312, + "y": -60.895999908447266 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 602.4149780273438, + "y": -58.709999084472656 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 604.6010131835938, + "y": -56.45399856567383 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 606.7160034179688, + "y": -54.13100051879883 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 608.7559814453125, + "y": -51.742000579833984 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 610.719970703125, + "y": -49.290000915527344 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 612.6060180664062, + "y": -46.77799987792969 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 614.4130249023438, + "y": -44.20800018310547 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 616.1370239257812, + "y": -41.582000732421875 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 617.7789916992188, + "y": -38.90399932861328 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 619.3350219726562, + "y": -36.17499923706055 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 620.8049926757812, + "y": -33.39899826049805 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 622.18701171875, + "y": -30.57699966430664 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 623.47998046875, + "y": -27.714000701904297 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 624.6820068359375, + "y": -24.812000274658203 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 625.7930297851562, + "y": -21.87299919128418 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 626.8099975585938, + "y": -18.900999069213867 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 627.7340087890625, + "y": -15.89900016784668 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 628.56298828125, + "y": -12.868000030517578 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 629.2960205078125, + "y": -9.814000129699707 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 629.9329833984375, + "y": -6.73799991607666 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 630.4730224609375, + "y": -3.6429998874664307 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 630.916015625, + "y": -0.5329999923706055 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 631.260986328125, + "y": 2.5889999866485596 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 631.5070190429688, + "y": 5.71999979019165 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 631.655029296875, + "y": 8.857999801635742 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 - }, - { - "x": 1104.02197265625, - "y": -6.821000099182129 - }, - { - "x": 1104.5150146484375, - "y": -0.5580000281333923 - }, - { - "x": 1104.81103515625, - "y": 5.7170000076293945 - }, - { - "x": 1104.9100341796875, + "x": 631.7050170898438, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 + "x": 631.655029296875, + "y": 15.140999794006348 }, { - "x": 1104.5150146484375, - "y": 24.558000564575195 + "x": 631.5070190429688, + "y": 18.27899932861328 }, { - "x": 1104.02197265625, - "y": 30.820999145507812 + "x": 631.260986328125, + "y": 21.40999984741211 }, { - "x": 1103.3330078125, - "y": 37.066001892089844 + "x": 630.916015625, + "y": 24.533000946044922 }, { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 630.4730224609375, + "y": 27.64299964904785 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 629.9329833984375, + "y": 30.738000869750977 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 629.2960205078125, + "y": 33.81399917602539 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 628.56298828125, + "y": 36.86800003051758 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 627.7340087890625, + "y": 39.89899826049805 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 626.8099975585938, + "y": 42.9010009765625 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 625.7930297851562, + "y": 45.87300109863281 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 624.6820068359375, + "y": 48.8120002746582 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 623.47998046875, + "y": 51.7140007019043 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 622.18701171875, + "y": 54.57699966430664 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 620.8049926757812, + "y": 57.39899826049805 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 619.3350219726562, + "y": 60.17499923706055 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 617.7789916992188, + "y": 62.90399932861328 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 616.1370239257812, + "y": 65.58200073242188 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 614.4130249023438, + "y": 68.20800018310547 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 612.6060180664062, + "y": 70.77799987792969 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 610.719970703125, + "y": 73.29000091552734 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 608.7559814453125, + "y": 75.74199676513672 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 606.7160034179688, + "y": 78.13099670410156 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 604.6010131835938, + "y": 80.4540023803711 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 602.4149780273438, + "y": 82.70999908447266 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 600.1589965820312, + "y": 84.89600372314453 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 597.8359985351562, + "y": 87.01100158691406 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 595.447021484375, + "y": 89.0510025024414 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 592.9949951171875, + "y": 91.01499938964844 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 590.4829711914062, + "y": 92.9010009765625 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 587.9130249023438, + "y": 94.70800018310547 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 585.2869873046875, + "y": 96.43199920654297 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 582.6090087890625, + "y": 98.0739974975586 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 579.8800048828125, + "y": 99.62999725341797 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 577.10400390625, + "y": 101.0999984741211 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 574.2830200195312, + "y": 102.48200225830078 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 571.4190063476562, + "y": 103.7750015258789 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 568.5170288085938, + "y": 104.97699737548828 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 565.5780029296875, + "y": 106.08799743652344 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 562.6060180664062, + "y": 107.1050033569336 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 559.60400390625, + "y": 108.02899932861328 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 - }, - { - "x": 948.5380249023438, - "y": 207.18299865722656 - }, - { - "x": 942.385986328125, - "y": 208.45700073242188 - }, - { - "x": 936.197021484375, - "y": 209.53700256347656 - }, - { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 558.2050170898438, + "y": 108.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752..58c7ca7a8 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-1783955894 .fill-N1{fill:#0A0F25;} + .d2-1783955894 .fill-N2{fill:#676C7E;} + .d2-1783955894 .fill-N3{fill:#9499AB;} + .d2-1783955894 .fill-N4{fill:#CFD2DD;} + .d2-1783955894 .fill-N5{fill:#DEE1EB;} + .d2-1783955894 .fill-N6{fill:#EEF1F8;} + .d2-1783955894 .fill-N7{fill:#FFFFFF;} + .d2-1783955894 .fill-B1{fill:#0D32B2;} + .d2-1783955894 .fill-B2{fill:#0D32B2;} + .d2-1783955894 .fill-B3{fill:#E3E9FD;} + .d2-1783955894 .fill-B4{fill:#E3E9FD;} + .d2-1783955894 .fill-B5{fill:#EDF0FD;} + .d2-1783955894 .fill-B6{fill:#F7F8FE;} + .d2-1783955894 .fill-AA2{fill:#4A6FF3;} + .d2-1783955894 .fill-AA4{fill:#EDF0FD;} + .d2-1783955894 .fill-AA5{fill:#F7F8FE;} + .d2-1783955894 .fill-AB4{fill:#EDF0FD;} + .d2-1783955894 .fill-AB5{fill:#F7F8FE;} + .d2-1783955894 .stroke-N1{stroke:#0A0F25;} + .d2-1783955894 .stroke-N2{stroke:#676C7E;} + .d2-1783955894 .stroke-N3{stroke:#9499AB;} + .d2-1783955894 .stroke-N4{stroke:#CFD2DD;} + .d2-1783955894 .stroke-N5{stroke:#DEE1EB;} + .d2-1783955894 .stroke-N6{stroke:#EEF1F8;} + .d2-1783955894 .stroke-N7{stroke:#FFFFFF;} + .d2-1783955894 .stroke-B1{stroke:#0D32B2;} + .d2-1783955894 .stroke-B2{stroke:#0D32B2;} + .d2-1783955894 .stroke-B3{stroke:#E3E9FD;} + .d2-1783955894 .stroke-B4{stroke:#E3E9FD;} + .d2-1783955894 .stroke-B5{stroke:#EDF0FD;} + .d2-1783955894 .stroke-B6{stroke:#F7F8FE;} + .d2-1783955894 .stroke-AA2{stroke:#4A6FF3;} + .d2-1783955894 .stroke-AA4{stroke:#EDF0FD;} + .d2-1783955894 .stroke-AA5{stroke:#F7F8FE;} + .d2-1783955894 .stroke-AB4{stroke:#EDF0FD;} + .d2-1783955894 .stroke-AB5{stroke:#F7F8FE;} + .d2-1783955894 .background-color-N1{background-color:#0A0F25;} + .d2-1783955894 .background-color-N2{background-color:#676C7E;} + .d2-1783955894 .background-color-N3{background-color:#9499AB;} + .d2-1783955894 .background-color-N4{background-color:#CFD2DD;} + .d2-1783955894 .background-color-N5{background-color:#DEE1EB;} + .d2-1783955894 .background-color-N6{background-color:#EEF1F8;} + .d2-1783955894 .background-color-N7{background-color:#FFFFFF;} + .d2-1783955894 .background-color-B1{background-color:#0D32B2;} + .d2-1783955894 .background-color-B2{background-color:#0D32B2;} + .d2-1783955894 .background-color-B3{background-color:#E3E9FD;} + .d2-1783955894 .background-color-B4{background-color:#E3E9FD;} + .d2-1783955894 .background-color-B5{background-color:#EDF0FD;} + .d2-1783955894 .background-color-B6{background-color:#F7F8FE;} + .d2-1783955894 .background-color-AA2{background-color:#4A6FF3;} + .d2-1783955894 .background-color-AA4{background-color:#EDF0FD;} + .d2-1783955894 .background-color-AA5{background-color:#F7F8FE;} + .d2-1783955894 .background-color-AB4{background-color:#EDF0FD;} + .d2-1783955894 .background-color-AB5{background-color:#F7F8FE;} + .d2-1783955894 .color-N1{color:#0A0F25;} + .d2-1783955894 .color-N2{color:#676C7E;} + .d2-1783955894 .color-N3{color:#9499AB;} + .d2-1783955894 .color-N4{color:#CFD2DD;} + .d2-1783955894 .color-N5{color:#DEE1EB;} + .d2-1783955894 .color-N6{color:#EEF1F8;} + .d2-1783955894 .color-N7{color:#FFFFFF;} + .d2-1783955894 .color-B1{color:#0D32B2;} + .d2-1783955894 .color-B2{color:#0D32B2;} + .d2-1783955894 .color-B3{color:#E3E9FD;} + .d2-1783955894 .color-B4{color:#E3E9FD;} + .d2-1783955894 .color-B5{color:#EDF0FD;} + .d2-1783955894 .color-B6{color:#F7F8FE;} + .d2-1783955894 .color-AA2{color:#4A6FF3;} + .d2-1783955894 .color-AA4{color:#EDF0FD;} + .d2-1783955894 .color-AA5{color:#F7F8FE;} + .d2-1783955894 .color-AB4{color:#EDF0FD;} + .d2-1783955894 .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-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1783955894);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1783955894);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1783955894);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1783955894);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file