diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index cdea39a49..c63eb2039 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -15,7 +15,7 @@ const ( MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 - ARC_STEPS = 80 + ARC_STEPS = 100 ) // Layout lays out the graph and computes curved edge routes. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 4f79d35bb..78ed2dffe 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -541,270 +541,334 @@ "route": [ { "x": 26.5, - "y": -198.22900390625 + "y": -198.22999572753906 }, { - "x": 27.402000427246094, - "y": -198.11300659179688 + "x": 28.18000030517578, + "y": -198.00399780273438 }, { "x": 31.285999298095703, "y": -197.53700256347656 }, { - "x": 35.159000396728516, - "y": -196.88499450683594 + "x": 34.3849983215332, + "y": -197.02099609375 }, { - "x": 39.018001556396484, - "y": -196.15699768066406 + "x": 37.47600173950195, + "y": -196.45700073242188 }, { - "x": 42.861000061035156, - "y": -195.35299682617188 + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 }, { "x": 46.68899917602539, "y": -194.47300720214844 }, { - "x": 50.49800109863281, - "y": -193.5189971923828 + "x": 49.73699951171875, + "y": -193.71600341796875 }, { - "x": 54.28799819946289, - "y": -192.49099731445312 + "x": 52.77399826049805, + "y": -192.91099548339844 }, { - "x": 58.055999755859375, - "y": -191.38800048828125 + "x": 55.79800033569336, + "y": -192.05799865722656 + }, + { + "x": 58.80799865722656, + "y": -191.1580047607422 }, { "x": 61.803001403808594, "y": -190.21099853515625 }, { - "x": 65.5260009765625, - "y": -188.96099853515625 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 69.2229995727539, - "y": -187.63800048828125 + "x": 67.74700164794922, + "y": -188.17599487304688 }, { - "x": 72.89399719238281, - "y": -186.24200439453125 + "x": 70.69400024414062, + "y": -187.08799743652344 + }, + { + "x": 73.6240005493164, + "y": -185.9550018310547 }, { "x": 76.53600311279297, "y": -184.77499389648438 }, { - "x": 80.14900207519531, - "y": -183.23699951171875 + "x": 79.42900085449219, + "y": -183.5500030517578 }, { - "x": 83.73100280761719, - "y": -181.6280059814453 + "x": 82.302001953125, + "y": -182.27999877929688 }, { - "x": 87.28099822998047, - "y": -179.94900512695312 + "x": 85.15499877929688, + "y": -180.96499633789062 + }, + { + "x": 87.98699951171875, + "y": -179.60499572753906 }, { "x": 90.7979965209961, "y": -178.2010040283203 }, { - "x": 94.27899932861328, - "y": -176.38400268554688 + "x": 93.58499908447266, + "y": -176.7530059814453 }, { - "x": 97.7239990234375, - "y": -174.49899291992188 + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 101.13099670410156, - "y": -172.54600524902344 + "x": 99.09100341796875, + "y": -173.7259979248047 + }, + { + "x": 101.80799865722656, + "y": -172.1479949951172 }, { "x": 104.4990005493164, "y": -170.5279998779297 }, { - "x": 107.8270034790039, - "y": -168.4429931640625 + "x": 107.16500091552734, + "y": -168.86500549316406 }, { - "x": 111.11399841308594, - "y": -166.29299926757812 + "x": 109.80400085449219, + "y": -167.16099548339844 }, { - "x": 114.35700225830078, - "y": -164.0800018310547 + "x": 112.41600036621094, + "y": -165.41600036621094 + }, + { + "x": 115.0009994506836, + "y": -163.62899780273438 }, { "x": 117.55699920654297, "y": -161.80299377441406 }, { - "x": 120.71099853515625, - "y": -159.46400451660156 + "x": 120.08399963378906, + "y": -159.93600463867188 }, { - "x": 123.81800079345703, - "y": -157.06300354003906 + "x": 122.58100128173828, + "y": -158.031005859375 }, { - "x": 126.87799835205078, - "y": -154.6020050048828 + "x": 125.0479965209961, + "y": -156.08599853515625 + }, + { + "x": 127.48400115966797, + "y": -154.1020050048828 }, { "x": 129.88900756835938, "y": -152.08099365234375 }, { - "x": 132.85000610351562, - "y": -149.50100708007812 + "x": 132.26199340820312, + "y": -150.02200317382812 }, { - "x": 135.75999450683594, - "y": -146.86399841308594 + "x": 134.6020050048828, + "y": -147.92599487304688 }, { - "x": 138.61700439453125, - "y": -144.1699981689453 + "x": 136.90899658203125, + "y": -145.79299926757812 + }, + { + "x": 139.1820068359375, + "y": -143.625 }, { "x": 141.42100524902344, "y": -141.42100524902344 }, { - "x": 144.1699981689453, - "y": -138.61700439453125 + "x": 143.625, + "y": -139.1820068359375 }, { - "x": 146.86399841308594, - "y": -135.75999450683594 + "x": 145.79299926757812, + "y": -136.90899658203125 }, { - "x": 149.50100708007812, - "y": -132.85000610351562 + "x": 147.92599487304688, + "y": -134.6020050048828 + }, + { + "x": 150.02200317382812, + "y": -132.26199340820312 }, { "x": 152.08099365234375, "y": -129.88900756835938 }, { - "x": 154.6020050048828, - "y": -126.87799835205078 + "x": 154.1020050048828, + "y": -127.48400115966797 }, { - "x": 157.06300354003906, - "y": -123.81800079345703 + "x": 156.08599853515625, + "y": -125.0479965209961 }, { - "x": 159.46400451660156, - "y": -120.71099853515625 + "x": 158.031005859375, + "y": -122.58100128173828 + }, + { + "x": 159.93600463867188, + "y": -120.08399963378906 }, { "x": 161.80299377441406, "y": -117.55699920654297 }, { - "x": 164.0800018310547, - "y": -114.35700225830078 + "x": 163.62899780273438, + "y": -115.0009994506836 }, { - "x": 166.29299926757812, - "y": -111.11399841308594 + "x": 165.41600036621094, + "y": -112.41600036621094 }, { - "x": 168.4429931640625, - "y": -107.8270034790039 + "x": 167.16099548339844, + "y": -109.80400085449219 + }, + { + "x": 168.86500549316406, + "y": -107.16500091552734 }, { "x": 170.5279998779297, "y": -104.4990005493164 }, { - "x": 172.54600524902344, - "y": -101.13099670410156 + "x": 172.1479949951172, + "y": -101.80799865722656 }, { - "x": 174.49899291992188, - "y": -97.7239990234375 + "x": 173.7259979248047, + "y": -99.09100341796875 }, { - "x": 176.38400268554688, - "y": -94.27899932861328 + "x": 175.26100158691406, + "y": -96.3499984741211 + }, + { + "x": 176.7530059814453, + "y": -93.58499908447266 }, { "x": 178.2010040283203, "y": -90.7979965209961 }, { - "x": 179.94900512695312, - "y": -87.28099822998047 + "x": 179.60499572753906, + "y": -87.98699951171875 }, { - "x": 181.6280059814453, - "y": -83.73100280761719 + "x": 180.96499633789062, + "y": -85.15499877929688 }, { - "x": 183.23699951171875, - "y": -80.14900207519531 + "x": 182.27999877929688, + "y": -82.302001953125 + }, + { + "x": 183.5500030517578, + "y": -79.42900085449219 }, { "x": 184.77499389648438, "y": -76.53600311279297 }, { - "x": 186.24200439453125, - "y": -72.89399719238281 + "x": 185.9550018310547, + "y": -73.6240005493164 }, { - "x": 187.63800048828125, - "y": -69.2229995727539 + "x": 187.08799743652344, + "y": -70.69400024414062 }, { - "x": 188.96099853515625, - "y": -65.5260009765625 + "x": 188.17599487304688, + "y": -67.74700164794922 + }, + { + "x": 189.2169952392578, + "y": -64.78299713134766 }, { "x": 190.21099853515625, "y": -61.803001403808594 }, { - "x": 191.38800048828125, - "y": -58.055999755859375 + "x": 191.1580047607422, + "y": -58.80799865722656 }, { - "x": 192.49099731445312, - "y": -54.28799819946289 + "x": 192.05799865722656, + "y": -55.79800033569336 }, { - "x": 193.5189971923828, - "y": -50.49800109863281 + "x": 192.91099548339844, + "y": -52.77399826049805 + }, + { + "x": 193.71600341796875, + "y": -49.73699951171875 }, { "x": 194.47300720214844, "y": -46.68899917602539 }, { - "x": 195.35299682617188, - "y": -42.861000061035156 + "x": 195.18299865722656, + "y": -43.62799835205078 }, { - "x": 196.15699768066406, - "y": -39.018001556396484 + "x": 195.843994140625, + "y": -40.55699920654297 }, { - "x": 196.88499450683594, - "y": -35.159000396728516 + "x": 196.45700073242188, + "y": -37.47600173950195 }, { - "x": 197.24899291992188, + "x": 197.02099609375, + "y": -34.3849983215332 + }, + { + "x": 197.2519989013672, "y": -33 } ], @@ -840,272 +904,336 @@ "link": "", "route": [ { - "x": 197.24899291992188, + "x": 197.2519989013672, "y": 33 }, { - "x": 196.88499450683594, - "y": 35.159000396728516 + "x": 197.02099609375, + "y": 34.3849983215332 }, { - "x": 196.15699768066406, - "y": 39.018001556396484 + "x": 196.45700073242188, + "y": 37.47600173950195 }, { - "x": 195.35299682617188, - "y": 42.861000061035156 + "x": 195.843994140625, + "y": 40.55699920654297 + }, + { + "x": 195.18299865722656, + "y": 43.62799835205078 }, { "x": 194.47300720214844, "y": 46.68899917602539 }, { - "x": 193.5189971923828, - "y": 50.49800109863281 + "x": 193.71600341796875, + "y": 49.73699951171875 }, { - "x": 192.49099731445312, - "y": 54.28799819946289 + "x": 192.91099548339844, + "y": 52.77399826049805 }, { - "x": 191.38800048828125, - "y": 58.055999755859375 + "x": 192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": 191.1580047607422, + "y": 58.80799865722656 }, { "x": 190.21099853515625, "y": 61.803001403808594 }, { - "x": 188.96099853515625, - "y": 65.5260009765625 + "x": 189.2169952392578, + "y": 64.78299713134766 }, { - "x": 187.63800048828125, - "y": 69.2229995727539 + "x": 188.17599487304688, + "y": 67.74700164794922 }, { - "x": 186.24200439453125, - "y": 72.89399719238281 + "x": 187.08799743652344, + "y": 70.69400024414062 + }, + { + "x": 185.9550018310547, + "y": 73.6240005493164 }, { "x": 184.77499389648438, "y": 76.53600311279297 }, { - "x": 183.23699951171875, - "y": 80.14900207519531 + "x": 183.5500030517578, + "y": 79.42900085449219 }, { - "x": 181.6280059814453, - "y": 83.73100280761719 + "x": 182.27999877929688, + "y": 82.302001953125 }, { - "x": 179.94900512695312, - "y": 87.28099822998047 + "x": 180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": 179.60499572753906, + "y": 87.98699951171875 }, { "x": 178.2010040283203, "y": 90.7979965209961 }, { - "x": 176.38400268554688, - "y": 94.27899932861328 + "x": 176.7530059814453, + "y": 93.58499908447266 }, { - "x": 174.49899291992188, - "y": 97.7239990234375 + "x": 175.26100158691406, + "y": 96.3499984741211 }, { - "x": 172.54600524902344, - "y": 101.13099670410156 + "x": 173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": 172.1479949951172, + "y": 101.80799865722656 }, { "x": 170.5279998779297, "y": 104.4990005493164 }, { - "x": 168.4429931640625, - "y": 107.8270034790039 + "x": 168.86500549316406, + "y": 107.16500091552734 }, { - "x": 166.29299926757812, - "y": 111.11399841308594 + "x": 167.16099548339844, + "y": 109.80400085449219 }, { - "x": 164.0800018310547, - "y": 114.35700225830078 + "x": 165.41600036621094, + "y": 112.41600036621094 + }, + { + "x": 163.62899780273438, + "y": 115.0009994506836 }, { "x": 161.80299377441406, "y": 117.55699920654297 }, { - "x": 159.46400451660156, - "y": 120.71099853515625 + "x": 159.93600463867188, + "y": 120.08399963378906 }, { - "x": 157.06300354003906, - "y": 123.81800079345703 + "x": 158.031005859375, + "y": 122.58100128173828 }, { - "x": 154.6020050048828, - "y": 126.87799835205078 + "x": 156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": 154.1020050048828, + "y": 127.48400115966797 }, { "x": 152.08099365234375, "y": 129.88900756835938 }, { - "x": 149.50100708007812, - "y": 132.85000610351562 + "x": 150.02200317382812, + "y": 132.26199340820312 }, { - "x": 146.86399841308594, - "y": 135.75999450683594 + "x": 147.92599487304688, + "y": 134.6020050048828 }, { - "x": 144.1699981689453, - "y": 138.61700439453125 + "x": 145.79299926757812, + "y": 136.90899658203125 + }, + { + "x": 143.625, + "y": 139.1820068359375 }, { "x": 141.42100524902344, "y": 141.42100524902344 }, { - "x": 138.61700439453125, - "y": 144.1699981689453 + "x": 139.1820068359375, + "y": 143.625 }, { - "x": 135.75999450683594, - "y": 146.86399841308594 + "x": 136.90899658203125, + "y": 145.79299926757812 }, { - "x": 132.85000610351562, - "y": 149.50100708007812 + "x": 134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": 132.26199340820312, + "y": 150.02200317382812 }, { "x": 129.88900756835938, "y": 152.08099365234375 }, { - "x": 126.87799835205078, - "y": 154.6020050048828 + "x": 127.48400115966797, + "y": 154.1020050048828 }, { - "x": 123.81800079345703, - "y": 157.06300354003906 + "x": 125.0479965209961, + "y": 156.08599853515625 }, { - "x": 120.71099853515625, - "y": 159.46400451660156 + "x": 122.58100128173828, + "y": 158.031005859375 + }, + { + "x": 120.08399963378906, + "y": 159.93600463867188 }, { "x": 117.55699920654297, "y": 161.80299377441406 }, { - "x": 114.35700225830078, - "y": 164.0800018310547 + "x": 115.0009994506836, + "y": 163.62899780273438 }, { - "x": 111.11399841308594, - "y": 166.29299926757812 + "x": 112.41600036621094, + "y": 165.41600036621094 }, { - "x": 107.8270034790039, - "y": 168.4429931640625 + "x": 109.80400085449219, + "y": 167.16099548339844 + }, + { + "x": 107.16500091552734, + "y": 168.86500549316406 }, { "x": 104.4990005493164, "y": 170.5279998779297 }, { - "x": 101.13099670410156, - "y": 172.54600524902344 + "x": 101.80799865722656, + "y": 172.1479949951172 }, { - "x": 97.7239990234375, - "y": 174.49899291992188 + "x": 99.09100341796875, + "y": 173.7259979248047 }, { - "x": 94.27899932861328, - "y": 176.38400268554688 + "x": 96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": 93.58499908447266, + "y": 176.7530059814453 }, { "x": 90.7979965209961, "y": 178.2010040283203 }, { - "x": 87.28099822998047, - "y": 179.94900512695312 + "x": 87.98699951171875, + "y": 179.60499572753906 }, { - "x": 83.73100280761719, - "y": 181.6280059814453 + "x": 85.15499877929688, + "y": 180.96499633789062 }, { - "x": 80.14900207519531, - "y": 183.23699951171875 + "x": 82.302001953125, + "y": 182.27999877929688 + }, + { + "x": 79.42900085449219, + "y": 183.5500030517578 }, { "x": 76.53600311279297, "y": 184.77499389648438 }, { - "x": 72.89399719238281, - "y": 186.24200439453125 + "x": 73.6240005493164, + "y": 185.9550018310547 }, { - "x": 69.2229995727539, - "y": 187.63800048828125 + "x": 70.69400024414062, + "y": 187.08799743652344 }, { - "x": 65.5260009765625, - "y": 188.96099853515625 + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 }, { "x": 61.803001403808594, "y": 190.21099853515625 }, { - "x": 58.055999755859375, - "y": 191.38800048828125 + "x": 58.80799865722656, + "y": 191.1580047607422 }, { - "x": 54.28799819946289, - "y": 192.49099731445312 + "x": 55.79800033569336, + "y": 192.05799865722656 }, { - "x": 50.49800109863281, - "y": 193.5189971923828 + "x": 52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": 49.73699951171875, + "y": 193.71600341796875 }, { "x": 46.68899917602539, "y": 194.47300720214844 }, { - "x": 42.861000061035156, - "y": 195.35299682617188 + "x": 43.62799835205078, + "y": 195.18299865722656 }, { - "x": 39.018001556396484, - "y": 196.15699768066406 + "x": 40.55699920654297, + "y": 195.843994140625 }, { - "x": 35.159000396728516, - "y": 196.88499450683594 + "x": 37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": 34.3849983215332, + "y": 197.02099609375 }, { "x": 31.285999298095703, "y": 197.53700256347656 }, { - "x": 27.402000427246094, - "y": 198.11300659179688 + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, - "y": 198.22900390625 + "y": 198.22999572753906 } ], "isCurve": true, @@ -1141,270 +1269,334 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22900390625 + "y": 198.22999572753906 }, { - "x": -27.402000427246094, - "y": 198.11300659179688 + "x": -28.18000030517578, + "y": 198.00399780273438 }, { "x": -31.285999298095703, "y": 197.53700256347656 }, { - "x": -35.159000396728516, - "y": 196.88499450683594 + "x": -34.3849983215332, + "y": 197.02099609375 }, { - "x": -39.018001556396484, - "y": 196.15699768066406 + "x": -37.47600173950195, + "y": 196.45700073242188 }, { - "x": -42.861000061035156, - "y": 195.35299682617188 + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 }, { "x": -46.68899917602539, "y": 194.47300720214844 }, { - "x": -50.49800109863281, - "y": 193.5189971923828 + "x": -49.73699951171875, + "y": 193.71600341796875 }, { - "x": -54.28799819946289, - "y": 192.49099731445312 + "x": -52.77399826049805, + "y": 192.91099548339844 }, { - "x": -58.055999755859375, - "y": 191.38800048828125 + "x": -55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": -58.80799865722656, + "y": 191.1580047607422 }, { "x": -61.803001403808594, "y": 190.21099853515625 }, { - "x": -65.5260009765625, - "y": 188.96099853515625 + "x": -64.78299713134766, + "y": 189.2169952392578 }, { - "x": -69.2229995727539, - "y": 187.63800048828125 + "x": -67.74700164794922, + "y": 188.17599487304688 }, { - "x": -72.89399719238281, - "y": 186.24200439453125 + "x": -70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": -73.6240005493164, + "y": 185.9550018310547 }, { "x": -76.53600311279297, "y": 184.77499389648438 }, { - "x": -80.14900207519531, - "y": 183.23699951171875 + "x": -79.42900085449219, + "y": 183.5500030517578 }, { - "x": -83.73100280761719, - "y": 181.6280059814453 + "x": -82.302001953125, + "y": 182.27999877929688 }, { - "x": -87.28099822998047, - "y": 179.94900512695312 + "x": -85.15499877929688, + "y": 180.96499633789062 + }, + { + "x": -87.98699951171875, + "y": 179.60499572753906 }, { "x": -90.7979965209961, "y": 178.2010040283203 }, { - "x": -94.27899932861328, - "y": 176.38400268554688 + "x": -93.58499908447266, + "y": 176.7530059814453 }, { - "x": -97.7239990234375, - "y": 174.49899291992188 + "x": -96.3499984741211, + "y": 175.26100158691406 }, { - "x": -101.13099670410156, - "y": 172.54600524902344 + "x": -99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": -101.80799865722656, + "y": 172.1479949951172 }, { "x": -104.4990005493164, "y": 170.5279998779297 }, { - "x": -107.8270034790039, - "y": 168.4429931640625 + "x": -107.16500091552734, + "y": 168.86500549316406 }, { - "x": -111.11399841308594, - "y": 166.29299926757812 + "x": -109.80400085449219, + "y": 167.16099548339844 }, { - "x": -114.35700225830078, - "y": 164.0800018310547 + "x": -112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": -115.0009994506836, + "y": 163.62899780273438 }, { "x": -117.55699920654297, "y": 161.80299377441406 }, { - "x": -120.71099853515625, - "y": 159.46400451660156 + "x": -120.08399963378906, + "y": 159.93600463867188 }, { - "x": -123.81800079345703, - "y": 157.06300354003906 + "x": -122.58100128173828, + "y": 158.031005859375 }, { - "x": -126.87799835205078, - "y": 154.6020050048828 + "x": -125.0479965209961, + "y": 156.08599853515625 + }, + { + "x": -127.48400115966797, + "y": 154.1020050048828 }, { "x": -129.88900756835938, "y": 152.08099365234375 }, { - "x": -132.85000610351562, - "y": 149.50100708007812 + "x": -132.26199340820312, + "y": 150.02200317382812 }, { - "x": -135.75999450683594, - "y": 146.86399841308594 + "x": -134.6020050048828, + "y": 147.92599487304688 }, { - "x": -138.61700439453125, - "y": 144.1699981689453 + "x": -136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": -139.1820068359375, + "y": 143.625 }, { "x": -141.42100524902344, "y": 141.42100524902344 }, { - "x": -144.1699981689453, - "y": 138.61700439453125 + "x": -143.625, + "y": 139.1820068359375 }, { - "x": -146.86399841308594, - "y": 135.75999450683594 + "x": -145.79299926757812, + "y": 136.90899658203125 }, { - "x": -149.50100708007812, - "y": 132.85000610351562 + "x": -147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": -150.02200317382812, + "y": 132.26199340820312 }, { "x": -152.08099365234375, "y": 129.88900756835938 }, { - "x": -154.6020050048828, - "y": 126.87799835205078 + "x": -154.1020050048828, + "y": 127.48400115966797 }, { - "x": -157.06300354003906, - "y": 123.81800079345703 + "x": -156.08599853515625, + "y": 125.0479965209961 }, { - "x": -159.46400451660156, - "y": 120.71099853515625 + "x": -158.031005859375, + "y": 122.58100128173828 + }, + { + "x": -159.93600463867188, + "y": 120.08399963378906 }, { "x": -161.80299377441406, "y": 117.55699920654297 }, { - "x": -164.0800018310547, - "y": 114.35700225830078 + "x": -163.62899780273438, + "y": 115.0009994506836 }, { - "x": -166.29299926757812, - "y": 111.11399841308594 + "x": -165.41600036621094, + "y": 112.41600036621094 }, { - "x": -168.4429931640625, - "y": 107.8270034790039 + "x": -167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": -168.86500549316406, + "y": 107.16500091552734 }, { "x": -170.5279998779297, "y": 104.4990005493164 }, { - "x": -172.54600524902344, - "y": 101.13099670410156 + "x": -172.1479949951172, + "y": 101.80799865722656 }, { - "x": -174.49899291992188, - "y": 97.7239990234375 + "x": -173.7259979248047, + "y": 99.09100341796875 }, { - "x": -176.38400268554688, - "y": 94.27899932861328 + "x": -175.26100158691406, + "y": 96.3499984741211 + }, + { + "x": -176.7530059814453, + "y": 93.58499908447266 }, { "x": -178.2010040283203, "y": 90.7979965209961 }, { - "x": -179.94900512695312, - "y": 87.28099822998047 + "x": -179.60499572753906, + "y": 87.98699951171875 }, { - "x": -181.6280059814453, - "y": 83.73100280761719 + "x": -180.96499633789062, + "y": 85.15499877929688 }, { - "x": -183.23699951171875, - "y": 80.14900207519531 + "x": -182.27999877929688, + "y": 82.302001953125 + }, + { + "x": -183.5500030517578, + "y": 79.42900085449219 }, { "x": -184.77499389648438, "y": 76.53600311279297 }, { - "x": -186.24200439453125, - "y": 72.89399719238281 + "x": -185.9550018310547, + "y": 73.6240005493164 }, { - "x": -187.63800048828125, - "y": 69.2229995727539 + "x": -187.08799743652344, + "y": 70.69400024414062 }, { - "x": -188.96099853515625, - "y": 65.5260009765625 + "x": -188.17599487304688, + "y": 67.74700164794922 + }, + { + "x": -189.2169952392578, + "y": 64.78299713134766 }, { "x": -190.21099853515625, "y": 61.803001403808594 }, { - "x": -191.38800048828125, - "y": 58.055999755859375 + "x": -191.1580047607422, + "y": 58.80799865722656 }, { - "x": -192.49099731445312, - "y": 54.28799819946289 + "x": -192.05799865722656, + "y": 55.79800033569336 }, { - "x": -193.5189971923828, - "y": 50.49800109863281 + "x": -192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": -193.71600341796875, + "y": 49.73699951171875 }, { "x": -194.47300720214844, "y": 46.68899917602539 }, { - "x": -195.35299682617188, - "y": 42.861000061035156 + "x": -195.18299865722656, + "y": 43.62799835205078 }, { - "x": -196.15699768066406, - "y": 39.018001556396484 + "x": -195.843994140625, + "y": 40.55699920654297 }, { - "x": -196.88499450683594, - "y": 35.159000396728516 + "x": -196.45700073242188, + "y": 37.47600173950195 }, { - "x": -197.24899291992188, + "x": -197.02099609375, + "y": 34.3849983215332 + }, + { + "x": -197.2519989013672, "y": 33 } ], @@ -1441,282 +1633,350 @@ "route": [ { "x": 539.5, - "y": -148.2310028076172 + "y": -148.2259979248047 }, { - "x": 544.2860107421875, - "y": -147.53700256347656 + "x": 542.2160034179688, + "y": -147.85400390625 }, { - "x": 549.447021484375, - "y": -146.64999389648438 + "x": 546.35302734375, + "y": -147.19900512695312 + }, + { + "x": 550.4760131835938, + "y": -146.45700073242188 }, { "x": 554.5819702148438, "y": -145.62899780273438 }, { - "x": 559.6890258789062, - "y": -144.47300720214844 + "x": 558.6699829101562, + "y": -144.71499633789062 }, { - "x": 564.7630004882812, - "y": -143.18499755859375 + "x": 562.7369995117188, + "y": -143.71600341796875 }, { - "x": 569.802978515625, - "y": -141.76300048828125 + "x": 566.7830200195312, + "y": -142.6320037841797 + }, + { + "x": 570.8060302734375, + "y": -141.46299743652344 }, { "x": 574.802978515625, "y": -140.21099853515625 }, { - "x": 579.760986328125, - "y": -138.5279998779297 + "x": 578.7730102539062, + "y": -138.875 }, { - "x": 584.6729736328125, - "y": -136.71600341796875 + "x": 582.7139892578125, + "y": -137.45599365234375 }, { - "x": 589.5360107421875, - "y": -134.77499389648438 + "x": 586.6240234375, + "y": -135.9550018310547 + }, + { + "x": 590.5029907226562, + "y": -134.3719940185547 }, { "x": 594.3469848632812, "y": -132.70899963378906 }, { - "x": 599.1019897460938, - "y": -130.51699829101562 + "x": 598.155029296875, + "y": -130.96499633789062 }, { - "x": 603.7979736328125, - "y": -128.2010040283203 + "x": 601.927001953125, + "y": -129.14199829101562 }, { - "x": 608.4310302734375, - "y": -125.76300048828125 + "x": 605.6589965820312, + "y": -127.23999786376953 + }, + { + "x": 609.3499755859375, + "y": -125.26100158691406 }, { "x": 613, "y": -123.20500183105469 }, { - "x": 617.4990234375, - "y": -120.52799987792969 + "x": 616.60498046875, + "y": -121.0719985961914 }, { - "x": 621.927001953125, - "y": -117.73400115966797 + "x": 620.1649780273438, + "y": -118.86499786376953 }, { - "x": 626.281005859375, - "y": -114.82499694824219 + "x": 623.677978515625, + "y": -116.58399963378906 + }, + { + "x": 627.1420288085938, + "y": -114.22899627685547 }, { "x": 630.5570068359375, "y": -111.8030014038086 }, { - "x": 634.7520141601562, - "y": -108.66999816894531 + "x": 633.9190063476562, + "y": -109.30500030517578 }, { - "x": 638.864013671875, - "y": -105.42900085449219 + "x": 637.22900390625, + "y": -106.73799896240234 }, { - "x": 642.8889770507812, - "y": -102.08100128173828 + "x": 640.4840087890625, + "y": -104.10199737548828 + }, + { + "x": 643.6840209960938, + "y": -101.39900207519531 }, { "x": 646.8259887695312, "y": -98.62799835205078 }, { - "x": 650.6699829101562, - "y": -95.0739974975586 + "x": 649.9089965820312, + "y": -95.79299926757812 }, { - "x": 654.4210205078125, - "y": -91.4209976196289 + "x": 652.9320068359375, + "y": -92.89399719238281 }, { - "x": 658.073974609375, - "y": -87.66999816894531 + "x": 655.8939819335938, + "y": -89.93199920654297 + }, + { + "x": 658.7930297851562, + "y": -86.90899658203125 }, { "x": 661.6279907226562, "y": -83.82599639892578 }, { - "x": 665.0809936523438, - "y": -79.88899993896484 + "x": 664.3989868164062, + "y": -80.68399810791016 }, { - "x": 668.4290161132812, - "y": -75.86399841308594 + "x": 667.1019897460938, + "y": -77.48400115966797 }, { - "x": 671.6699829101562, - "y": -71.75199890136719 + "x": 669.7379760742188, + "y": -74.22899627685547 + }, + { + "x": 672.3049926757812, + "y": -70.91899871826172 }, { "x": 674.802978515625, "y": -67.55699920654297 }, { - "x": 677.8250122070312, - "y": -63.28099822998047 + "x": 677.22900390625, + "y": -64.14199829101562 }, { - "x": 680.7340087890625, - "y": -58.926998138427734 + "x": 679.583984375, + "y": -60.678001403808594 }, { - "x": 683.5280151367188, - "y": -54.499000549316406 + "x": 681.864990234375, + "y": -57.165000915527344 + }, + { + "x": 684.072021484375, + "y": -53.60499954223633 }, { "x": 686.2050170898438, "y": -50 }, { - "x": 688.7630004882812, - "y": -45.430999755859375 + "x": 688.260986328125, + "y": -46.349998474121094 }, { - "x": 691.2009887695312, - "y": -40.79800033569336 + "x": 690.239990234375, + "y": -42.659000396728516 }, { - "x": 693.5170288085938, - "y": -36.10200119018555 + "x": 692.1420288085938, + "y": -38.926998138427734 + }, + { + "x": 693.9650268554688, + "y": -35.154998779296875 }, { "x": 695.708984375, "y": -31.347000122070312 }, { - "x": 697.7750244140625, - "y": -26.535999298095703 + "x": 697.3720092773438, + "y": -27.503000259399414 }, { - "x": 699.7160034179688, - "y": -21.67300033569336 + "x": 698.9550170898438, + "y": -23.624000549316406 }, { - "x": 701.5280151367188, - "y": -16.76099967956543 + "x": 700.4559936523438, + "y": -19.714000701904297 + }, + { + "x": 701.875, + "y": -15.77299976348877 }, { "x": 703.2109985351562, "y": -11.803000450134277 }, { - "x": 704.7630004882812, - "y": -6.802999973297119 + "x": 704.4630126953125, + "y": -7.806000232696533 }, { - "x": 706.1849975585938, - "y": -1.7630000114440918 + "x": 705.6320190429688, + "y": -3.7829999923706055 }, { - "x": 707.4730224609375, - "y": 3.309999942779541 + "x": 706.7160034179688, + "y": 0.2619999945163727 + }, + { + "x": 707.7150268554688, + "y": 4.328999996185303 }, { "x": 708.6290283203125, "y": 8.416999816894531 }, { - "x": 709.6500244140625, - "y": 13.552000045776367 + "x": 709.4569702148438, + "y": 12.52299976348877 }, { - "x": 710.5369873046875, - "y": 18.71299934387207 + "x": 710.198974609375, + "y": 16.645999908447266 }, { - "x": 711.2880249023438, - "y": 23.893999099731445 + "x": 710.85400390625, + "y": 20.783000946044922 + }, + { + "x": 711.4219970703125, + "y": 24.933000564575195 }, { "x": 711.9039916992188, "y": 29.0939998626709 }, { - "x": 712.3829956054688, - "y": 34.30799865722656 + "x": 712.2979736328125, + "y": 33.263999938964844 }, { - "x": 712.7249755859375, - "y": 39.53200149536133 + "x": 712.60498046875, + "y": 37.441001892089844 }, { - "x": 712.9310302734375, - "y": 44.763999938964844 + "x": 712.823974609375, + "y": 41.624000549316406 + }, + { + "x": 712.9559936523438, + "y": 45.81100082397461 }, { "x": 713, "y": 50 }, { - "x": 712.9310302734375, - "y": 55.23500061035156 + "x": 712.9559936523438, + "y": 54.1879997253418 }, { - "x": 712.7249755859375, - "y": 60.46699905395508 + "x": 712.823974609375, + "y": 58.375 }, { - "x": 712.3829956054688, - "y": 65.69100189208984 + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 }, { "x": 711.9039916992188, "y": 70.90499877929688 }, { - "x": 711.2880249023438, - "y": 76.1050033569336 + "x": 711.4219970703125, + "y": 75.06600189208984 }, { - "x": 710.5369873046875, - "y": 81.28600311279297 + "x": 710.85400390625, + "y": 79.21600341796875 }, { - "x": 709.6500244140625, - "y": 86.4469985961914 + "x": 710.198974609375, + "y": 83.35299682617188 + }, + { + "x": 709.4569702148438, + "y": 87.47599792480469 }, { "x": 708.6290283203125, "y": 91.58200073242188 }, { - "x": 707.4730224609375, - "y": 96.68900299072266 + "x": 707.7150268554688, + "y": 95.66999816894531 }, { - "x": 706.1849975585938, - "y": 101.76300048828125 + "x": 706.7160034179688, + "y": 99.73699951171875 }, { - "x": 704.7630004882812, - "y": 106.8030014038086 + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 }, { "x": 703.2109985351562, "y": 111.8030014038086 }, { - "x": 701.5280151367188, - "y": 116.76100158691406 + "x": 701.875, + "y": 115.77300262451172 }, { - "x": 701.4400024414062, + "x": 701.4329833984375, "y": 116.9990005493164 } ], @@ -1752,7 +2012,7 @@ "link": "", "route": [ { - "x": 662.35302734375, + "x": 662.3569946289062, "y": 182.99899291992188 }, { @@ -1760,263 +2020,327 @@ "y": 183.8260040283203 }, { - "x": 658.073974609375, - "y": 187.6699981689453 + "x": 658.7930297851562, + "y": 186.90899658203125 }, { - "x": 654.4210205078125, - "y": 191.42100524902344 + "x": 655.8939819335938, + "y": 189.9320068359375 }, { - "x": 650.6699829101562, - "y": 195.07400512695312 + "x": 652.9320068359375, + "y": 192.8939971923828 + }, + { + "x": 649.9089965820312, + "y": 195.79299926757812 }, { "x": 646.8259887695312, "y": 198.6280059814453 }, { - "x": 642.8889770507812, - "y": 202.08099365234375 + "x": 643.6840209960938, + "y": 201.3990020751953 }, { - "x": 638.864013671875, - "y": 205.4290008544922 + "x": 640.4840087890625, + "y": 204.1020050048828 }, { - "x": 634.7520141601562, - "y": 208.6699981689453 + "x": 637.22900390625, + "y": 206.73800659179688 + }, + { + "x": 633.9190063476562, + "y": 209.30499267578125 }, { "x": 630.5570068359375, "y": 211.80299377441406 }, { - "x": 626.281005859375, - "y": 214.8249969482422 + "x": 627.1420288085938, + "y": 214.22900390625 }, { - "x": 621.927001953125, - "y": 217.73399353027344 + "x": 623.677978515625, + "y": 216.58399963378906 }, { - "x": 617.4990234375, - "y": 220.5279998779297 + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 }, { "x": 613, "y": 223.2050018310547 }, { - "x": 608.4310302734375, - "y": 225.76300048828125 + "x": 609.3499755859375, + "y": 225.26100158691406 }, { - "x": 603.7979736328125, - "y": 228.2010040283203 + "x": 605.6589965820312, + "y": 227.24000549316406 }, { - "x": 599.1019897460938, - "y": 230.51699829101562 + "x": 601.927001953125, + "y": 229.14199829101562 + }, + { + "x": 598.155029296875, + "y": 230.96499633789062 }, { "x": 594.3469848632812, "y": 232.70899963378906 }, { - "x": 589.5360107421875, - "y": 234.77499389648438 + "x": 590.5029907226562, + "y": 234.3719940185547 }, { - "x": 584.6729736328125, - "y": 236.71600341796875 + "x": 586.6240234375, + "y": 235.9550018310547 }, { - "x": 579.760986328125, - "y": 238.5279998779297 + "x": 582.7139892578125, + "y": 237.45599365234375 + }, + { + "x": 578.7730102539062, + "y": 238.875 }, { "x": 574.802978515625, "y": 240.21099853515625 }, { - "x": 569.802978515625, - "y": 241.76300048828125 + "x": 570.8060302734375, + "y": 241.46299743652344 }, { - "x": 564.7630004882812, - "y": 243.18499755859375 + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 559.6890258789062, - "y": 244.47300720214844 + "x": 562.7369995117188, + "y": 243.71600341796875 + }, + { + "x": 558.6699829101562, + "y": 244.71499633789062 }, { "x": 554.5819702148438, "y": 245.62899780273438 }, { - "x": 549.447021484375, - "y": 246.64999389648438 + "x": 550.4760131835938, + "y": 246.45700073242188 }, { - "x": 544.2860107421875, - "y": 247.53700256347656 + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 539.10498046875, - "y": 248.28799438476562 + "x": 542.2160034179688, + "y": 247.85400390625 + }, + { + "x": 538.0659790039062, + "y": 248.4219970703125 }, { "x": 533.905029296875, "y": 248.9040069580078 }, { - "x": 528.6909790039062, - "y": 249.38299560546875 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 523.4669799804688, - "y": 249.72500610351562 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 518.2349853515625, - "y": 249.93099975585938 + "x": 521.375, + "y": 249.82400512695312 + }, + { + "x": 517.18798828125, + "y": 249.95599365234375 }, { "x": 513, "y": 250 }, { - "x": 507.7640075683594, - "y": 249.93099975585938 + "x": 508.8110046386719, + "y": 249.95599365234375 }, { - "x": 502.5320129394531, - "y": 249.72500610351562 + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 497.3080139160156, - "y": 249.38299560546875 + "x": 500.4410095214844, + "y": 249.60499572753906 + }, + { + "x": 496.2640075683594, + "y": 249.29800415039062 }, { "x": 492.093994140625, "y": 248.9040069580078 }, { - "x": 486.8940124511719, - "y": 248.28799438476562 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 481.7130126953125, - "y": 247.53700256347656 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 476.552001953125, - "y": 246.64999389648438 + "x": 479.64599609375, + "y": 247.19900512695312 + }, + { + "x": 475.52301025390625, + "y": 246.45700073242188 }, { "x": 471.4169921875, "y": 245.62899780273438 }, { - "x": 466.30999755859375, - "y": 244.47300720214844 + "x": 467.3290100097656, + "y": 244.71499633789062 }, { - "x": 461.2359924316406, - "y": 243.18499755859375 + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": 456.1960144042969, - "y": 241.76300048828125 + "x": 459.21600341796875, + "y": 242.6320037841797 + }, + { + "x": 455.1929931640625, + "y": 241.46299743652344 }, { "x": 451.1960144042969, "y": 240.21099853515625 }, { - "x": 446.2380065917969, - "y": 238.5279998779297 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": 441.32598876953125, - "y": 236.71600341796875 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": 436.4630126953125, - "y": 234.77499389648438 + "x": 439.375, + "y": 235.9550018310547 + }, + { + "x": 435.4960021972656, + "y": 234.3719940185547 }, { "x": 431.6520080566406, "y": 232.70899963378906 }, { - "x": 426.8970031738281, - "y": 230.51699829101562 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": 422.20098876953125, - "y": 228.2010040283203 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": 417.5679931640625, - "y": 225.76300048828125 + "x": 420.3399963378906, + "y": 227.24000549316406 + }, + { + "x": 416.64898681640625, + "y": 225.26100158691406 }, { "x": 413, "y": 223.2050018310547 }, { - "x": 408.5, - "y": 220.5279998779297 + "x": 409.3940124511719, + "y": 221.07200622558594 }, { - "x": 404.0719909667969, - "y": 217.73399353027344 + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": 399.7179870605469, - "y": 214.8249969482422 + "x": 402.3210144042969, + "y": 216.58399963378906 + }, + { + "x": 398.85699462890625, + "y": 214.22900390625 }, { "x": 395.4419860839844, "y": 211.80299377441406 }, { - "x": 391.24700927734375, - "y": 208.6699981689453 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": 387.135009765625, - "y": 205.4290008544922 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": 383.1099853515625, - "y": 202.08099365234375 + "x": 385.5150146484375, + "y": 204.1020050048828 + }, + { + "x": 382.31500244140625, + "y": 201.3990020751953 }, { "x": 379.1730041503906, "y": 198.6280059814453 }, { - "x": 375.3290100097656, - "y": 195.07400512695312 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": 371.5780029296875, - "y": 191.42100524902344 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": 367.92498779296875, - "y": 187.6699981689453 + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 }, { "x": 364.3710021972656, "y": 183.8260040283203 }, { - "x": 363.64599609375, + "x": 363.6419982910156, "y": 183 } ], @@ -2053,295 +2377,367 @@ "route": [ { "x": 998.5, - "y": -198.19900512695312 + "y": -198.21800231933594 }, { "x": 1003.2860107421875, "y": -197.53700256347656 }, { - "x": 1011.0180053710938, - "y": -196.15699768066406 + "x": 1009.4760131835938, + "y": -196.45700073242188 }, { - "x": 1018.6890258789062, - "y": -194.47300720214844 + "x": 1015.6279907226562, + "y": -195.18299865722656 }, { - "x": 1026.2879638671875, - "y": -192.49099731445312 + "x": 1021.7369995117188, + "y": -193.71600341796875 + }, + { + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { "x": 1033.802978515625, "y": -190.21099853515625 }, { - "x": 1041.2230224609375, - "y": -187.63800048828125 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 1048.5360107421875, - "y": -184.77499389648438 + "x": 1045.6240234375, + "y": -185.9550018310547 }, { - "x": 1055.73095703125, - "y": -181.6280059814453 + "x": 1051.428955078125, + "y": -183.5500030517578 + }, + { + "x": 1057.155029296875, + "y": -180.96499633789062 }, { "x": 1062.7979736328125, "y": -178.2010040283203 }, { - "x": 1069.7239990234375, - "y": -174.49899291992188 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 1076.4990234375, - "y": -170.5279998779297 + "x": 1073.8079833984375, + "y": -172.1479949951172 }, { - "x": 1083.114013671875, - "y": -166.29299926757812 + "x": 1079.1650390625, + "y": -168.86500549316406 + }, + { + "x": 1084.416015625, + "y": -165.41600036621094 }, { "x": 1089.5570068359375, "y": -161.80299377441406 }, { - "x": 1095.8179931640625, - "y": -157.06300354003906 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 1101.8890380859375, - "y": -152.08099365234375 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 1107.760009765625, - "y": -146.86399841308594 + "x": 1104.261962890625, + "y": -150.02200317382812 + }, + { + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { "x": 1113.4210205078125, "y": -141.42100524902344 }, { - "x": 1118.864013671875, - "y": -135.75999450683594 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 1124.0810546875, - "y": -129.88900756835938 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 1129.06298828125, - "y": -123.81800079345703 + "x": 1126.10205078125, + "y": -127.48400115966797 + }, + { + "x": 1130.031005859375, + "y": -122.58100128173828 }, { "x": 1133.802978515625, "y": -117.55699920654297 }, { - "x": 1138.29296875, - "y": -111.11399841308594 + "x": 1137.416015625, + "y": -112.41600036621094 }, { - "x": 1142.5279541015625, - "y": -104.4990005493164 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 1146.4990234375, - "y": -97.7239990234375 + "x": 1144.14794921875, + "y": -101.80799865722656 + }, + { + "x": 1147.260986328125, + "y": -96.3499984741211 }, { "x": 1150.2010498046875, "y": -90.7979965209961 }, { - "x": 1153.6280517578125, - "y": -83.73100280761719 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 1156.7750244140625, - "y": -76.53600311279297 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 1159.637939453125, - "y": -69.2229995727539 + "x": 1157.9549560546875, + "y": -73.6240005493164 + }, + { + "x": 1160.176025390625, + "y": -67.74700164794922 }, { "x": 1162.2110595703125, "y": -61.803001403808594 }, { - "x": 1164.490966796875, - "y": -54.28799819946289 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 1166.4730224609375, - "y": -46.68899917602539 + "x": 1165.7159423828125, + "y": -49.73699951171875 }, { - "x": 1168.156982421875, - "y": -39.018001556396484 + "x": 1167.1829833984375, + "y": -43.62799835205078 + }, + { + "x": 1168.45703125, + "y": -37.47600173950195 }, { "x": 1169.5369873046875, "y": -31.285999298095703 }, { - "x": 1170.613037109375, - "y": -23.506999969482422 + "x": 1170.4219970703125, + "y": -25.06599998474121 }, { - "x": 1171.383056640625, - "y": -15.690999984741211 + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 1171.844970703125, - "y": -7.85099983215332 + "x": 1171.60498046875, + "y": -12.557999610900879 + }, + { + "x": 1171.9010009765625, + "y": -6.2820000648498535 }, { "x": 1172, "y": 0 }, { - "x": 1171.844970703125, - "y": 7.85099983215332 + "x": 1171.9010009765625, + "y": 6.2820000648498535 }, { - "x": 1171.383056640625, - "y": 15.690999984741211 + "x": 1171.60498046875, + "y": 12.557999610900879 }, { - "x": 1170.613037109375, - "y": 23.506999969482422 + "x": 1171.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1170.4219970703125, + "y": 25.06599998474121 }, { "x": 1169.5369873046875, "y": 31.285999298095703 }, { - "x": 1168.156982421875, - "y": 39.018001556396484 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 1166.4730224609375, - "y": 46.68899917602539 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 1164.490966796875, - "y": 54.28799819946289 + "x": 1165.7159423828125, + "y": 49.73699951171875 + }, + { + "x": 1164.0579833984375, + "y": 55.79800033569336 }, { "x": 1162.2110595703125, "y": 61.803001403808594 }, { - "x": 1159.637939453125, - "y": 69.2229995727539 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 1156.7750244140625, - "y": 76.53600311279297 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 1153.6280517578125, - "y": 83.73100280761719 + "x": 1155.550048828125, + "y": 79.42900085449219 + }, + { + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { "x": 1150.2010498046875, "y": 90.7979965209961 }, { - "x": 1146.4990234375, - "y": 97.7239990234375 + "x": 1147.260986328125, + "y": 96.3499984741211 }, { - "x": 1142.5279541015625, - "y": 104.4990005493164 + "x": 1144.14794921875, + "y": 101.80799865722656 }, { - "x": 1138.29296875, - "y": 111.11399841308594 + "x": 1140.864990234375, + "y": 107.16500091552734 + }, + { + "x": 1137.416015625, + "y": 112.41600036621094 }, { "x": 1133.802978515625, "y": 117.55699920654297 }, { - "x": 1129.06298828125, - "y": 123.81800079345703 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 1124.0810546875, - "y": 129.88900756835938 + "x": 1126.10205078125, + "y": 127.48400115966797 }, { - "x": 1118.864013671875, - "y": 135.75999450683594 + "x": 1122.02197265625, + "y": 132.26199340820312 + }, + { + "x": 1117.79296875, + "y": 136.90899658203125 }, { "x": 1113.4210205078125, "y": 141.42100524902344 }, { - "x": 1107.760009765625, - "y": 146.86399841308594 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 1101.8890380859375, - "y": 152.08099365234375 + "x": 1104.261962890625, + "y": 150.02200317382812 }, { - "x": 1095.8179931640625, - "y": 157.06300354003906 + "x": 1099.4840087890625, + "y": 154.1020050048828 + }, + { + "x": 1094.5810546875, + "y": 158.031005859375 }, { "x": 1089.5570068359375, "y": 161.80299377441406 }, { - "x": 1083.114013671875, - "y": 166.29299926757812 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 1076.4990234375, - "y": 170.5279998779297 + "x": 1079.1650390625, + "y": 168.86500549316406 }, { - "x": 1069.7239990234375, - "y": 174.49899291992188 + "x": 1073.8079833984375, + "y": 172.1479949951172 + }, + { + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { "x": 1062.7979736328125, "y": 178.2010040283203 }, { - "x": 1055.73095703125, - "y": 181.6280059814453 + "x": 1057.155029296875, + "y": 180.96499633789062 }, { - "x": 1048.5360107421875, - "y": 184.77499389648438 + "x": 1051.428955078125, + "y": 183.5500030517578 }, { - "x": 1041.2230224609375, - "y": 187.63800048828125 + "x": 1045.6240234375, + "y": 185.9550018310547 + }, + { + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { "x": 1033.802978515625, "y": 190.21099853515625 }, { - "x": 1026.2879638671875, - "y": 192.49099731445312 + "x": 1027.7979736328125, + "y": 192.05799865722656 }, { - "x": 1018.6890258789062, - "y": 194.47300720214844 + "x": 1021.7369995117188, + "y": 193.71600341796875 }, { - "x": 1011.0180053710938, - "y": 196.15699768066406 + "x": 1015.6279907226562, + "y": 195.18299865722656 + }, + { + "x": 1009.4760131835938, + "y": 196.45700073242188 }, { "x": 1003.2860107421875, @@ -2349,7 +2745,7 @@ }, { "x": 998.5, - "y": 198.19900512695312 + "y": 198.21800231933594 } ], "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 cbcfebd41..015478d74 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-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .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-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 8f19b558c..6eb058a84 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -541,270 +541,334 @@ "route": [ { "x": 38.5, - "y": -186.22900390625 + "y": -186.22999572753906 }, { - "x": 39.402000427246094, - "y": -186.11300659179688 + "x": 40.18000030517578, + "y": -186.00399780273438 }, { "x": 43.2859992980957, "y": -185.53700256347656 }, { - "x": 47.159000396728516, - "y": -184.88499450683594 + "x": 46.3849983215332, + "y": -185.02099609375 }, { - "x": 51.018001556396484, - "y": -184.15699768066406 + "x": 49.47600173950195, + "y": -184.45700073242188 }, { - "x": 54.861000061035156, - "y": -183.35299682617188 + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 }, { "x": 58.68899917602539, "y": -182.47300720214844 }, { - "x": 62.49800109863281, - "y": -181.5189971923828 + "x": 61.73699951171875, + "y": -181.71600341796875 }, { - "x": 66.28800201416016, - "y": -180.49099731445312 + "x": 64.77400207519531, + "y": -180.91099548339844 }, { - "x": 70.05599975585938, - "y": -179.38800048828125 + "x": 67.7979965209961, + "y": -180.05799865722656 + }, + { + "x": 70.80799865722656, + "y": -179.1580047607422 }, { "x": 73.8030014038086, "y": -178.21099853515625 }, { - "x": 77.5260009765625, - "y": -176.96099853515625 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 81.2229995727539, - "y": -175.63800048828125 + "x": 79.74700164794922, + "y": -176.17599487304688 }, { - "x": 84.89399719238281, - "y": -174.24200439453125 + "x": 82.69400024414062, + "y": -175.08799743652344 + }, + { + "x": 85.6240005493164, + "y": -173.9550018310547 }, { "x": 88.53600311279297, "y": -172.77499389648438 }, { - "x": 92.14900207519531, - "y": -171.23699951171875 + "x": 91.42900085449219, + "y": -171.5500030517578 }, { - "x": 95.73100280761719, - "y": -169.6280059814453 + "x": 94.302001953125, + "y": -170.27999877929688 }, { - "x": 99.28099822998047, - "y": -167.94900512695312 + "x": 97.15499877929688, + "y": -168.96499633789062 + }, + { + "x": 99.98699951171875, + "y": -167.60499572753906 }, { "x": 102.7979965209961, "y": -166.2010040283203 }, { - "x": 106.27899932861328, - "y": -164.38400268554688 + "x": 105.58499908447266, + "y": -164.7530059814453 }, { - "x": 109.7239990234375, - "y": -162.49899291992188 + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 113.13099670410156, - "y": -160.54600524902344 + "x": 111.09100341796875, + "y": -161.7259979248047 + }, + { + "x": 113.80799865722656, + "y": -160.1479949951172 }, { "x": 116.4990005493164, "y": -158.5279998779297 }, { - "x": 119.8270034790039, - "y": -156.4429931640625 + "x": 119.16500091552734, + "y": -156.86500549316406 }, { - "x": 123.11399841308594, - "y": -154.29299926757812 + "x": 121.80400085449219, + "y": -155.16099548339844 }, { - "x": 126.35700225830078, - "y": -152.0800018310547 + "x": 124.41600036621094, + "y": -153.41600036621094 + }, + { + "x": 127.0009994506836, + "y": -151.62899780273438 }, { "x": 129.5570068359375, "y": -149.80299377441406 }, { - "x": 132.71099853515625, - "y": -147.46400451660156 + "x": 132.08399963378906, + "y": -147.93600463867188 }, { - "x": 135.8179931640625, - "y": -145.06300354003906 + "x": 134.58099365234375, + "y": -146.031005859375 }, { - "x": 138.8780059814453, - "y": -142.6020050048828 + "x": 137.04800415039062, + "y": -144.08599853515625 + }, + { + "x": 139.48399353027344, + "y": -142.1020050048828 }, { "x": 141.88900756835938, "y": -140.08099365234375 }, { - "x": 144.85000610351562, - "y": -137.50100708007812 + "x": 144.26199340820312, + "y": -138.02200317382812 }, { - "x": 147.75999450683594, - "y": -134.86399841308594 + "x": 146.6020050048828, + "y": -135.92599487304688 }, { - "x": 150.61700439453125, - "y": -132.1699981689453 + "x": 148.90899658203125, + "y": -133.79299926757812 + }, + { + "x": 151.1820068359375, + "y": -131.625 }, { "x": 153.42100524902344, "y": -129.42100524902344 }, { - "x": 156.1699981689453, - "y": -126.61699676513672 + "x": 155.625, + "y": -127.18199920654297 }, { - "x": 158.86399841308594, - "y": -123.76000213623047 + "x": 157.79299926757812, + "y": -124.90899658203125 }, { - "x": 161.50100708007812, - "y": -120.8499984741211 + "x": 159.92599487304688, + "y": -122.60199737548828 + }, + { + "x": 162.02200317382812, + "y": -120.26200103759766 }, { "x": 164.08099365234375, "y": -117.88899993896484 }, { - "x": 166.6020050048828, - "y": -114.87799835205078 + "x": 166.1020050048828, + "y": -115.48400115966797 }, { - "x": 169.06300354003906, - "y": -111.81800079345703 + "x": 168.08599853515625, + "y": -113.0479965209961 }, { - "x": 171.46400451660156, - "y": -108.71099853515625 + "x": 170.031005859375, + "y": -110.58100128173828 + }, + { + "x": 171.93600463867188, + "y": -108.08399963378906 }, { "x": 173.80299377441406, "y": -105.55699920654297 }, { - "x": 176.0800018310547, - "y": -102.35700225830078 + "x": 175.62899780273438, + "y": -103.0009994506836 }, { - "x": 178.29299926757812, - "y": -99.11399841308594 + "x": 177.41600036621094, + "y": -100.41600036621094 }, { - "x": 180.4429931640625, - "y": -95.8270034790039 + "x": 179.16099548339844, + "y": -97.80400085449219 + }, + { + "x": 180.86500549316406, + "y": -95.16500091552734 }, { "x": 182.5279998779297, "y": -92.4990005493164 }, { - "x": 184.54600524902344, - "y": -89.13099670410156 + "x": 184.1479949951172, + "y": -89.80799865722656 }, { - "x": 186.49899291992188, - "y": -85.7239990234375 + "x": 185.7259979248047, + "y": -87.09100341796875 }, { - "x": 188.38400268554688, - "y": -82.27899932861328 + "x": 187.26100158691406, + "y": -84.3499984741211 + }, + { + "x": 188.7530059814453, + "y": -81.58499908447266 }, { "x": 190.2010040283203, "y": -78.7979965209961 }, { - "x": 191.94900512695312, - "y": -75.28099822998047 + "x": 191.60499572753906, + "y": -75.98699951171875 }, { - "x": 193.6280059814453, - "y": -71.73100280761719 + "x": 192.96499633789062, + "y": -73.15499877929688 }, { - "x": 195.23699951171875, - "y": -68.14900207519531 + "x": 194.27999877929688, + "y": -70.302001953125 + }, + { + "x": 195.5500030517578, + "y": -67.42900085449219 }, { "x": 196.77499389648438, "y": -64.53600311279297 }, { - "x": 198.24200439453125, - "y": -60.89400100708008 + "x": 197.9550018310547, + "y": -61.624000549316406 }, { - "x": 199.63800048828125, - "y": -57.222999572753906 + "x": 199.08799743652344, + "y": -58.694000244140625 }, { - "x": 200.96099853515625, - "y": -53.5260009765625 + "x": 200.17599487304688, + "y": -55.74700164794922 + }, + { + "x": 201.2169952392578, + "y": -52.78300094604492 }, { "x": 202.21099853515625, "y": -49.803001403808594 }, { - "x": 203.38800048828125, - "y": -46.055999755859375 + "x": 203.1580047607422, + "y": -46.80799865722656 }, { - "x": 204.49099731445312, - "y": -42.28799819946289 + "x": 204.05799865722656, + "y": -43.79800033569336 }, { - "x": 205.5189971923828, - "y": -38.49800109863281 + "x": 204.91099548339844, + "y": -40.77399826049805 + }, + { + "x": 205.71600341796875, + "y": -37.73699951171875 }, { "x": 206.47300720214844, "y": -34.68899917602539 }, { - "x": 207.35299682617188, - "y": -30.861000061035156 + "x": 207.18299865722656, + "y": -31.628000259399414 }, { - "x": 208.15699768066406, - "y": -27.01799964904785 + "x": 207.843994140625, + "y": -28.55699920654297 }, { - "x": 208.88499450683594, - "y": -23.159000396728516 + "x": 208.45700073242188, + "y": -25.47599983215332 }, { - "x": 209.24899291992188, + "x": 209.02099609375, + "y": -22.385000228881836 + }, + { + "x": 209.2519989013672, "y": -21 } ], @@ -840,272 +904,336 @@ "link": "", "route": [ { - "x": 209.24899291992188, + "x": 209.2519989013672, "y": 45 }, { - "x": 208.88499450683594, - "y": 47.159000396728516 + "x": 209.02099609375, + "y": 46.3849983215332 }, { - "x": 208.15699768066406, - "y": 51.018001556396484 + "x": 208.45700073242188, + "y": 49.47600173950195 }, { - "x": 207.35299682617188, - "y": 54.861000061035156 + "x": 207.843994140625, + "y": 52.55699920654297 + }, + { + "x": 207.18299865722656, + "y": 55.62799835205078 }, { "x": 206.47300720214844, "y": 58.68899917602539 }, { - "x": 205.5189971923828, - "y": 62.49800109863281 + "x": 205.71600341796875, + "y": 61.73699951171875 }, { - "x": 204.49099731445312, - "y": 66.28800201416016 + "x": 204.91099548339844, + "y": 64.77400207519531 }, { - "x": 203.38800048828125, - "y": 70.05599975585938 + "x": 204.05799865722656, + "y": 67.7979965209961 + }, + { + "x": 203.1580047607422, + "y": 70.80799865722656 }, { "x": 202.21099853515625, "y": 73.8030014038086 }, { - "x": 200.96099853515625, - "y": 77.5260009765625 + "x": 201.2169952392578, + "y": 76.78299713134766 }, { - "x": 199.63800048828125, - "y": 81.2229995727539 + "x": 200.17599487304688, + "y": 79.74700164794922 }, { - "x": 198.24200439453125, - "y": 84.89399719238281 + "x": 199.08799743652344, + "y": 82.69400024414062 + }, + { + "x": 197.9550018310547, + "y": 85.6240005493164 }, { "x": 196.77499389648438, "y": 88.53600311279297 }, { - "x": 195.23699951171875, - "y": 92.14900207519531 + "x": 195.5500030517578, + "y": 91.42900085449219 }, { - "x": 193.6280059814453, - "y": 95.73100280761719 + "x": 194.27999877929688, + "y": 94.302001953125 }, { - "x": 191.94900512695312, - "y": 99.28099822998047 + "x": 192.96499633789062, + "y": 97.15499877929688 + }, + { + "x": 191.60499572753906, + "y": 99.98699951171875 }, { "x": 190.2010040283203, "y": 102.7979965209961 }, { - "x": 188.38400268554688, - "y": 106.27899932861328 + "x": 188.7530059814453, + "y": 105.58499908447266 }, { - "x": 186.49899291992188, - "y": 109.7239990234375 + "x": 187.26100158691406, + "y": 108.3499984741211 }, { - "x": 184.54600524902344, - "y": 113.13099670410156 + "x": 185.7259979248047, + "y": 111.09100341796875 + }, + { + "x": 184.1479949951172, + "y": 113.80799865722656 }, { "x": 182.5279998779297, "y": 116.4990005493164 }, { - "x": 180.4429931640625, - "y": 119.8270034790039 + "x": 180.86500549316406, + "y": 119.16500091552734 }, { - "x": 178.29299926757812, - "y": 123.11399841308594 + "x": 179.16099548339844, + "y": 121.80400085449219 }, { - "x": 176.0800018310547, - "y": 126.35700225830078 + "x": 177.41600036621094, + "y": 124.41600036621094 + }, + { + "x": 175.62899780273438, + "y": 127.0009994506836 }, { "x": 173.80299377441406, "y": 129.5570068359375 }, { - "x": 171.46400451660156, - "y": 132.71099853515625 + "x": 171.93600463867188, + "y": 132.08399963378906 }, { - "x": 169.06300354003906, - "y": 135.8179931640625 + "x": 170.031005859375, + "y": 134.58099365234375 }, { - "x": 166.6020050048828, - "y": 138.8780059814453 + "x": 168.08599853515625, + "y": 137.04800415039062 + }, + { + "x": 166.1020050048828, + "y": 139.48399353027344 }, { "x": 164.08099365234375, "y": 141.88900756835938 }, { - "x": 161.50100708007812, - "y": 144.85000610351562 + "x": 162.02200317382812, + "y": 144.26199340820312 }, { - "x": 158.86399841308594, - "y": 147.75999450683594 + "x": 159.92599487304688, + "y": 146.6020050048828 }, { - "x": 156.1699981689453, - "y": 150.61700439453125 + "x": 157.79299926757812, + "y": 148.90899658203125 + }, + { + "x": 155.625, + "y": 151.1820068359375 }, { "x": 153.42100524902344, "y": 153.42100524902344 }, { - "x": 150.61700439453125, - "y": 156.1699981689453 + "x": 151.1820068359375, + "y": 155.625 }, { - "x": 147.75999450683594, - "y": 158.86399841308594 + "x": 148.90899658203125, + "y": 157.79299926757812 }, { - "x": 144.85000610351562, - "y": 161.50100708007812 + "x": 146.6020050048828, + "y": 159.92599487304688 + }, + { + "x": 144.26199340820312, + "y": 162.02200317382812 }, { "x": 141.88900756835938, "y": 164.08099365234375 }, { - "x": 138.8780059814453, - "y": 166.6020050048828 + "x": 139.48399353027344, + "y": 166.1020050048828 }, { - "x": 135.8179931640625, - "y": 169.06300354003906 + "x": 137.04800415039062, + "y": 168.08599853515625 }, { - "x": 132.71099853515625, - "y": 171.46400451660156 + "x": 134.58099365234375, + "y": 170.031005859375 + }, + { + "x": 132.08399963378906, + "y": 171.93600463867188 }, { "x": 129.5570068359375, "y": 173.80299377441406 }, { - "x": 126.35700225830078, - "y": 176.0800018310547 + "x": 127.0009994506836, + "y": 175.62899780273438 }, { - "x": 123.11399841308594, - "y": 178.29299926757812 + "x": 124.41600036621094, + "y": 177.41600036621094 }, { - "x": 119.8270034790039, - "y": 180.4429931640625 + "x": 121.80400085449219, + "y": 179.16099548339844 + }, + { + "x": 119.16500091552734, + "y": 180.86500549316406 }, { "x": 116.4990005493164, "y": 182.5279998779297 }, { - "x": 113.13099670410156, - "y": 184.54600524902344 + "x": 113.80799865722656, + "y": 184.1479949951172 }, { - "x": 109.7239990234375, - "y": 186.49899291992188 + "x": 111.09100341796875, + "y": 185.7259979248047 }, { - "x": 106.27899932861328, - "y": 188.38400268554688 + "x": 108.3499984741211, + "y": 187.26100158691406 + }, + { + "x": 105.58499908447266, + "y": 188.7530059814453 }, { "x": 102.7979965209961, "y": 190.2010040283203 }, { - "x": 99.28099822998047, - "y": 191.94900512695312 + "x": 99.98699951171875, + "y": 191.60499572753906 }, { - "x": 95.73100280761719, - "y": 193.6280059814453 + "x": 97.15499877929688, + "y": 192.96499633789062 }, { - "x": 92.14900207519531, - "y": 195.23699951171875 + "x": 94.302001953125, + "y": 194.27999877929688 + }, + { + "x": 91.42900085449219, + "y": 195.5500030517578 }, { "x": 88.53600311279297, "y": 196.77499389648438 }, { - "x": 84.89399719238281, - "y": 198.24200439453125 + "x": 85.6240005493164, + "y": 197.9550018310547 }, { - "x": 81.2229995727539, - "y": 199.63800048828125 + "x": 82.69400024414062, + "y": 199.08799743652344 }, { - "x": 77.5260009765625, - "y": 200.96099853515625 + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 }, { "x": 73.8030014038086, "y": 202.21099853515625 }, { - "x": 70.05599975585938, - "y": 203.38800048828125 + "x": 70.80799865722656, + "y": 203.1580047607422 }, { - "x": 66.28800201416016, - "y": 204.49099731445312 + "x": 67.7979965209961, + "y": 204.05799865722656 }, { - "x": 62.49800109863281, - "y": 205.5189971923828 + "x": 64.77400207519531, + "y": 204.91099548339844 + }, + { + "x": 61.73699951171875, + "y": 205.71600341796875 }, { "x": 58.68899917602539, "y": 206.47300720214844 }, { - "x": 54.861000061035156, - "y": 207.35299682617188 + "x": 55.62799835205078, + "y": 207.18299865722656 }, { - "x": 51.018001556396484, - "y": 208.15699768066406 + "x": 52.55699920654297, + "y": 207.843994140625 }, { - "x": 47.159000396728516, - "y": 208.88499450683594 + "x": 49.47600173950195, + "y": 208.45700073242188 + }, + { + "x": 46.3849983215332, + "y": 209.02099609375 }, { "x": 43.2859992980957, "y": 209.53700256347656 }, { - "x": 39.402000427246094, - "y": 210.11300659179688 + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, - "y": 210.22900390625 + "y": 210.22999572753906 } ], "isCurve": true, @@ -1141,270 +1269,334 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22900390625 + "y": 210.22999572753906 }, { - "x": -15.402000427246094, - "y": 210.11300659179688 + "x": -16.18000030517578, + "y": 210.00399780273438 }, { "x": -19.285999298095703, "y": 209.53700256347656 }, { - "x": -23.159000396728516, - "y": 208.88499450683594 + "x": -22.385000228881836, + "y": 209.02099609375 }, { - "x": -27.01799964904785, - "y": 208.15699768066406 + "x": -25.47599983215332, + "y": 208.45700073242188 }, { - "x": -30.861000061035156, - "y": 207.35299682617188 + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 }, { "x": -34.68899917602539, "y": 206.47300720214844 }, { - "x": -38.49800109863281, - "y": 205.5189971923828 + "x": -37.73699951171875, + "y": 205.71600341796875 }, { - "x": -42.28799819946289, - "y": 204.49099731445312 + "x": -40.77399826049805, + "y": 204.91099548339844 }, { - "x": -46.055999755859375, - "y": 203.38800048828125 + "x": -43.79800033569336, + "y": 204.05799865722656 + }, + { + "x": -46.80799865722656, + "y": 203.1580047607422 }, { "x": -49.803001403808594, "y": 202.21099853515625 }, { - "x": -53.5260009765625, - "y": 200.96099853515625 + "x": -52.78300094604492, + "y": 201.2169952392578 }, { - "x": -57.222999572753906, - "y": 199.63800048828125 + "x": -55.74700164794922, + "y": 200.17599487304688 }, { - "x": -60.89400100708008, - "y": 198.24200439453125 + "x": -58.694000244140625, + "y": 199.08799743652344 + }, + { + "x": -61.624000549316406, + "y": 197.9550018310547 }, { "x": -64.53600311279297, "y": 196.77499389648438 }, { - "x": -68.14900207519531, - "y": 195.23699951171875 + "x": -67.42900085449219, + "y": 195.5500030517578 }, { - "x": -71.73100280761719, - "y": 193.6280059814453 + "x": -70.302001953125, + "y": 194.27999877929688 }, { - "x": -75.28099822998047, - "y": 191.94900512695312 + "x": -73.15499877929688, + "y": 192.96499633789062 + }, + { + "x": -75.98699951171875, + "y": 191.60499572753906 }, { "x": -78.7979965209961, "y": 190.2010040283203 }, { - "x": -82.27899932861328, - "y": 188.38400268554688 + "x": -81.58499908447266, + "y": 188.7530059814453 }, { - "x": -85.7239990234375, - "y": 186.49899291992188 + "x": -84.3499984741211, + "y": 187.26100158691406 }, { - "x": -89.13099670410156, - "y": 184.54600524902344 + "x": -87.09100341796875, + "y": 185.7259979248047 + }, + { + "x": -89.80799865722656, + "y": 184.1479949951172 }, { "x": -92.4990005493164, "y": 182.5279998779297 }, { - "x": -95.8270034790039, - "y": 180.4429931640625 + "x": -95.16500091552734, + "y": 180.86500549316406 }, { - "x": -99.11399841308594, - "y": 178.29299926757812 + "x": -97.80400085449219, + "y": 179.16099548339844 }, { - "x": -102.35700225830078, - "y": 176.0800018310547 + "x": -100.41600036621094, + "y": 177.41600036621094 + }, + { + "x": -103.0009994506836, + "y": 175.62899780273438 }, { "x": -105.55699920654297, "y": 173.80299377441406 }, { - "x": -108.71099853515625, - "y": 171.46400451660156 + "x": -108.08399963378906, + "y": 171.93600463867188 }, { - "x": -111.81800079345703, - "y": 169.06300354003906 + "x": -110.58100128173828, + "y": 170.031005859375 }, { - "x": -114.87799835205078, - "y": 166.6020050048828 + "x": -113.0479965209961, + "y": 168.08599853515625 + }, + { + "x": -115.48400115966797, + "y": 166.1020050048828 }, { "x": -117.88899993896484, "y": 164.08099365234375 }, { - "x": -120.8499984741211, - "y": 161.50100708007812 + "x": -120.26200103759766, + "y": 162.02200317382812 }, { - "x": -123.76000213623047, - "y": 158.86399841308594 + "x": -122.60199737548828, + "y": 159.92599487304688 }, { - "x": -126.61699676513672, - "y": 156.1699981689453 + "x": -124.90899658203125, + "y": 157.79299926757812 + }, + { + "x": -127.18199920654297, + "y": 155.625 }, { "x": -129.42100524902344, "y": 153.42100524902344 }, { - "x": -132.1699981689453, - "y": 150.61700439453125 + "x": -131.625, + "y": 151.1820068359375 }, { - "x": -134.86399841308594, - "y": 147.75999450683594 + "x": -133.79299926757812, + "y": 148.90899658203125 }, { - "x": -137.50100708007812, - "y": 144.85000610351562 + "x": -135.92599487304688, + "y": 146.6020050048828 + }, + { + "x": -138.02200317382812, + "y": 144.26199340820312 }, { "x": -140.08099365234375, "y": 141.88900756835938 }, { - "x": -142.6020050048828, - "y": 138.8780059814453 + "x": -142.1020050048828, + "y": 139.48399353027344 }, { - "x": -145.06300354003906, - "y": 135.8179931640625 + "x": -144.08599853515625, + "y": 137.04800415039062 }, { - "x": -147.46400451660156, - "y": 132.71099853515625 + "x": -146.031005859375, + "y": 134.58099365234375 + }, + { + "x": -147.93600463867188, + "y": 132.08399963378906 }, { "x": -149.80299377441406, "y": 129.5570068359375 }, { - "x": -152.0800018310547, - "y": 126.35700225830078 + "x": -151.62899780273438, + "y": 127.0009994506836 }, { - "x": -154.29299926757812, - "y": 123.11399841308594 + "x": -153.41600036621094, + "y": 124.41600036621094 }, { - "x": -156.4429931640625, - "y": 119.8270034790039 + "x": -155.16099548339844, + "y": 121.80400085449219 + }, + { + "x": -156.86500549316406, + "y": 119.16500091552734 }, { "x": -158.5279998779297, "y": 116.4990005493164 }, { - "x": -160.54600524902344, - "y": 113.13099670410156 + "x": -160.1479949951172, + "y": 113.80799865722656 }, { - "x": -162.49899291992188, - "y": 109.7239990234375 + "x": -161.7259979248047, + "y": 111.09100341796875 }, { - "x": -164.38400268554688, - "y": 106.27899932861328 + "x": -163.26100158691406, + "y": 108.3499984741211 + }, + { + "x": -164.7530059814453, + "y": 105.58499908447266 }, { "x": -166.2010040283203, "y": 102.7979965209961 }, { - "x": -167.94900512695312, - "y": 99.28099822998047 + "x": -167.60499572753906, + "y": 99.98699951171875 }, { - "x": -169.6280059814453, - "y": 95.73100280761719 + "x": -168.96499633789062, + "y": 97.15499877929688 }, { - "x": -171.23699951171875, - "y": 92.14900207519531 + "x": -170.27999877929688, + "y": 94.302001953125 + }, + { + "x": -171.5500030517578, + "y": 91.42900085449219 }, { "x": -172.77499389648438, "y": 88.53600311279297 }, { - "x": -174.24200439453125, - "y": 84.89399719238281 + "x": -173.9550018310547, + "y": 85.6240005493164 }, { - "x": -175.63800048828125, - "y": 81.2229995727539 + "x": -175.08799743652344, + "y": 82.69400024414062 }, { - "x": -176.96099853515625, - "y": 77.5260009765625 + "x": -176.17599487304688, + "y": 79.74700164794922 + }, + { + "x": -177.2169952392578, + "y": 76.78299713134766 }, { "x": -178.21099853515625, "y": 73.8030014038086 }, { - "x": -179.38800048828125, - "y": 70.05599975585938 + "x": -179.1580047607422, + "y": 70.80799865722656 }, { - "x": -180.49099731445312, - "y": 66.28800201416016 + "x": -180.05799865722656, + "y": 67.7979965209961 }, { - "x": -181.5189971923828, - "y": 62.49800109863281 + "x": -180.91099548339844, + "y": 64.77400207519531 + }, + { + "x": -181.71600341796875, + "y": 61.73699951171875 }, { "x": -182.47300720214844, "y": 58.68899917602539 }, { - "x": -183.35299682617188, - "y": 54.861000061035156 + "x": -183.18299865722656, + "y": 55.62799835205078 }, { - "x": -184.15699768066406, - "y": 51.018001556396484 + "x": -183.843994140625, + "y": 52.55699920654297 }, { - "x": -184.88499450683594, - "y": 47.159000396728516 + "x": -184.45700073242188, + "y": 49.47600173950195 }, { - "x": -185.24899291992188, + "x": -185.02099609375, + "y": 46.3849983215332 + }, + { + "x": -185.2519989013672, "y": 45 } ], @@ -1441,282 +1633,350 @@ "route": [ { "x": 512, - "y": -136.2310028076172 + "y": -136.2259979248047 }, { - "x": 516.7860107421875, - "y": -135.53700256347656 + "x": 514.7160034179688, + "y": -135.85400390625 }, { - "x": 521.947021484375, - "y": -134.64999389648438 + "x": 518.85302734375, + "y": -135.19900512695312 + }, + { + "x": 522.9760131835938, + "y": -134.45700073242188 }, { "x": 527.0819702148438, "y": -133.62899780273438 }, { - "x": 532.1890258789062, - "y": -132.47300720214844 + "x": 531.1699829101562, + "y": -132.71499633789062 }, { - "x": 537.2630004882812, - "y": -131.18499755859375 + "x": 535.2369995117188, + "y": -131.71600341796875 }, { - "x": 542.302978515625, - "y": -129.76300048828125 + "x": 539.2830200195312, + "y": -130.6320037841797 + }, + { + "x": 543.3060302734375, + "y": -129.46299743652344 }, { "x": 547.302978515625, "y": -128.21099853515625 }, { - "x": 552.260986328125, - "y": -126.52799987792969 + "x": 551.2730102539062, + "y": -126.875 }, { - "x": 557.1729736328125, - "y": -124.71600341796875 + "x": 555.2139892578125, + "y": -125.45600128173828 }, { - "x": 562.0360107421875, - "y": -122.7750015258789 + "x": 559.1240234375, + "y": -123.95500183105469 + }, + { + "x": 563.0029907226562, + "y": -122.37200164794922 }, { "x": 566.8469848632812, "y": -120.70899963378906 }, { - "x": 571.6019897460938, - "y": -118.51699829101562 + "x": 570.655029296875, + "y": -118.96499633789062 }, { - "x": 576.2979736328125, - "y": -116.20099639892578 + "x": 574.427001953125, + "y": -117.14199829101562 }, { - "x": 580.9310302734375, - "y": -113.76300048828125 + "x": 578.1589965820312, + "y": -115.23999786376953 + }, + { + "x": 581.8499755859375, + "y": -113.26100158691406 }, { "x": 585.5, "y": -111.20500183105469 }, { - "x": 589.9990234375, - "y": -108.52799987792969 + "x": 589.10498046875, + "y": -109.0719985961914 }, { - "x": 594.427001953125, - "y": -105.73400115966797 + "x": 592.6649780273438, + "y": -106.86499786376953 }, { - "x": 598.781005859375, - "y": -102.82499694824219 + "x": 596.177978515625, + "y": -104.58399963378906 + }, + { + "x": 599.6420288085938, + "y": -102.22899627685547 }, { "x": 603.0570068359375, "y": -99.8030014038086 }, { - "x": 607.2520141601562, - "y": -96.66999816894531 + "x": 606.4190063476562, + "y": -97.30500030517578 }, { - "x": 611.364013671875, - "y": -93.42900085449219 + "x": 609.72900390625, + "y": -94.73799896240234 }, { - "x": 615.3889770507812, - "y": -90.08100128173828 + "x": 612.9840087890625, + "y": -92.10199737548828 + }, + { + "x": 616.1840209960938, + "y": -89.39900207519531 }, { "x": 619.3259887695312, "y": -86.62799835205078 }, { - "x": 623.1699829101562, - "y": -83.0739974975586 + "x": 622.4089965820312, + "y": -83.79299926757812 }, { - "x": 626.9210205078125, - "y": -79.4209976196289 + "x": 625.4320068359375, + "y": -80.89399719238281 }, { - "x": 630.573974609375, - "y": -75.66999816894531 + "x": 628.3939819335938, + "y": -77.93199920654297 + }, + { + "x": 631.2930297851562, + "y": -74.90899658203125 }, { "x": 634.1279907226562, "y": -71.82599639892578 }, { - "x": 637.5809936523438, - "y": -67.88899993896484 + "x": 636.8989868164062, + "y": -68.68399810791016 }, { - "x": 640.9290161132812, - "y": -63.86399841308594 + "x": 639.6019897460938, + "y": -65.48400115966797 }, { - "x": 644.1699829101562, - "y": -59.75199890136719 + "x": 642.2379760742188, + "y": -62.229000091552734 + }, + { + "x": 644.8049926757812, + "y": -58.91899871826172 }, { "x": 647.302978515625, "y": -55.55699920654297 }, { - "x": 650.3250122070312, - "y": -51.28099822998047 + "x": 649.72900390625, + "y": -52.141998291015625 }, { - "x": 653.2340087890625, - "y": -46.926998138427734 + "x": 652.083984375, + "y": -48.678001403808594 }, { - "x": 656.0280151367188, - "y": -42.499000549316406 + "x": 654.364990234375, + "y": -45.165000915527344 + }, + { + "x": 656.572021484375, + "y": -41.60499954223633 }, { "x": 658.7050170898438, "y": -38 }, { - "x": 661.2630004882812, - "y": -33.430999755859375 + "x": 660.760986328125, + "y": -34.349998474121094 }, { - "x": 663.7009887695312, - "y": -28.79800033569336 + "x": 662.739990234375, + "y": -30.659000396728516 }, { - "x": 666.0170288085938, - "y": -24.101999282836914 + "x": 664.6420288085938, + "y": -26.927000045776367 + }, + { + "x": 666.4650268554688, + "y": -23.155000686645508 }, { "x": 668.208984375, "y": -19.347000122070312 }, { - "x": 670.2750244140625, - "y": -14.53600025177002 + "x": 669.8720092773438, + "y": -15.503000259399414 }, { - "x": 672.2160034179688, - "y": -9.67300033569336 + "x": 671.4550170898438, + "y": -11.62399959564209 }, { - "x": 674.0280151367188, - "y": -4.761000156402588 + "x": 672.9559936523438, + "y": -7.714000225067139 + }, + { + "x": 674.375, + "y": -3.7730000019073486 }, { "x": 675.7109985351562, "y": 0.19599999487400055 }, { - "x": 677.2630004882812, - "y": 5.196000099182129 + "x": 676.9630126953125, + "y": 4.192999839782715 }, { - "x": 678.6849975585938, - "y": 10.236000061035156 + "x": 678.1320190429688, + "y": 8.215999603271484 }, { - "x": 679.9730224609375, - "y": 15.3100004196167 + "x": 679.2160034179688, + "y": 12.26200008392334 + }, + { + "x": 680.2150268554688, + "y": 16.32900047302246 }, { "x": 681.1290283203125, "y": 20.41699981689453 }, { - "x": 682.1500244140625, - "y": 25.552000045776367 + "x": 681.9569702148438, + "y": 24.523000717163086 }, { - "x": 683.0369873046875, - "y": 30.71299934387207 + "x": 682.698974609375, + "y": 28.645999908447266 }, { - "x": 683.7880249023438, - "y": 35.89400100708008 + "x": 683.35400390625, + "y": 32.78300094604492 + }, + { + "x": 683.9219970703125, + "y": 36.93299865722656 }, { "x": 684.4039916992188, "y": 41.09400177001953 }, { - "x": 684.8829956054688, - "y": 46.30799865722656 + "x": 684.7979736328125, + "y": 45.263999938964844 }, { - "x": 685.2249755859375, - "y": 51.53200149536133 + "x": 685.10498046875, + "y": 49.441001892089844 }, { - "x": 685.4310302734375, - "y": 56.763999938964844 + "x": 685.323974609375, + "y": 53.624000549316406 + }, + { + "x": 685.4559936523438, + "y": 57.81100082397461 }, { "x": 685.5, "y": 61.999000549316406 }, { - "x": 685.4310302734375, - "y": 67.23500061035156 + "x": 685.4559936523438, + "y": 66.18800354003906 }, { - "x": 685.2249755859375, - "y": 72.46700286865234 + "x": 685.323974609375, + "y": 70.375 }, { - "x": 684.8829956054688, - "y": 77.69100189208984 + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 }, { "x": 684.4039916992188, "y": 82.90499877929688 }, { - "x": 683.7880249023438, - "y": 88.1050033569336 + "x": 683.9219970703125, + "y": 87.06600189208984 }, { - "x": 683.0369873046875, - "y": 93.28600311279297 + "x": 683.35400390625, + "y": 91.21600341796875 }, { - "x": 682.1500244140625, - "y": 98.4469985961914 + "x": 682.698974609375, + "y": 95.35299682617188 + }, + { + "x": 681.9569702148438, + "y": 99.47599792480469 }, { "x": 681.1290283203125, "y": 103.58200073242188 }, { - "x": 679.9730224609375, - "y": 108.68900299072266 + "x": 680.2150268554688, + "y": 107.66999816894531 }, { - "x": 678.6849975585938, - "y": 113.76300048828125 + "x": 679.2160034179688, + "y": 111.73699951171875 }, { - "x": 677.2630004882812, - "y": 118.8030014038086 + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 }, { "x": 675.7109985351562, "y": 123.8030014038086 }, { - "x": 674.0280151367188, - "y": 128.76100158691406 + "x": 674.375, + "y": 127.77300262451172 }, { - "x": 673.9400024414062, + "x": 673.9329833984375, "y": 128.99899291992188 } ], @@ -1752,7 +2012,7 @@ "link": "", "route": [ { - "x": 634.85302734375, + "x": 634.8569946289062, "y": 194.99899291992188 }, { @@ -1760,263 +2020,327 @@ "y": 195.8260040283203 }, { - "x": 630.573974609375, - "y": 199.6699981689453 + "x": 631.2930297851562, + "y": 198.90899658203125 }, { - "x": 626.9210205078125, - "y": 203.42100524902344 + "x": 628.3939819335938, + "y": 201.9320068359375 }, { - "x": 623.1699829101562, - "y": 207.07400512695312 + "x": 625.4320068359375, + "y": 204.8939971923828 + }, + { + "x": 622.4089965820312, + "y": 207.79299926757812 }, { "x": 619.3259887695312, "y": 210.6280059814453 }, { - "x": 615.3889770507812, - "y": 214.08099365234375 + "x": 616.1840209960938, + "y": 213.3990020751953 }, { - "x": 611.364013671875, - "y": 217.4290008544922 + "x": 612.9840087890625, + "y": 216.1020050048828 }, { - "x": 607.2520141601562, - "y": 220.6699981689453 + "x": 609.72900390625, + "y": 218.73800659179688 + }, + { + "x": 606.4190063476562, + "y": 221.30499267578125 }, { "x": 603.0570068359375, "y": 223.80299377441406 }, { - "x": 598.781005859375, - "y": 226.8249969482422 + "x": 599.6420288085938, + "y": 226.22900390625 }, { - "x": 594.427001953125, - "y": 229.73399353027344 + "x": 596.177978515625, + "y": 228.58399963378906 }, { - "x": 589.9990234375, - "y": 232.5279998779297 + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 }, { "x": 585.5, "y": 235.2050018310547 }, { - "x": 580.9310302734375, - "y": 237.76300048828125 + "x": 581.8499755859375, + "y": 237.26100158691406 }, { - "x": 576.2979736328125, - "y": 240.2010040283203 + "x": 578.1589965820312, + "y": 239.24000549316406 }, { - "x": 571.6019897460938, - "y": 242.51699829101562 + "x": 574.427001953125, + "y": 241.14199829101562 + }, + { + "x": 570.655029296875, + "y": 242.96499633789062 }, { "x": 566.8469848632812, "y": 244.70899963378906 }, { - "x": 562.0360107421875, - "y": 246.77499389648438 + "x": 563.0029907226562, + "y": 246.3719940185547 }, { - "x": 557.1729736328125, - "y": 248.71600341796875 + "x": 559.1240234375, + "y": 247.9550018310547 }, { - "x": 552.260986328125, - "y": 250.5279998779297 + "x": 555.2139892578125, + "y": 249.45599365234375 + }, + { + "x": 551.2730102539062, + "y": 250.875 }, { "x": 547.302978515625, "y": 252.21099853515625 }, { - "x": 542.302978515625, - "y": 253.76300048828125 + "x": 543.3060302734375, + "y": 253.46299743652344 }, { - "x": 537.2630004882812, - "y": 255.18499755859375 + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 532.1890258789062, - "y": 256.4729919433594 + "x": 535.2369995117188, + "y": 255.71600341796875 + }, + { + "x": 531.1699829101562, + "y": 256.7149963378906 }, { "x": 527.0819702148438, "y": 257.6289978027344 }, { - "x": 521.947021484375, - "y": 258.6499938964844 + "x": 522.9760131835938, + "y": 258.4570007324219 }, { - "x": 516.7860107421875, - "y": 259.5369873046875 + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 511.6050109863281, - "y": 260.2879943847656 + "x": 514.7160034179688, + "y": 259.85400390625 + }, + { + "x": 510.5660095214844, + "y": 260.4219970703125 }, { "x": 506.4049987792969, "y": 260.90399169921875 }, { - "x": 501.1910095214844, - "y": 261.38299560546875 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 495.9670104980469, - "y": 261.7250061035156 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 490.7349853515625, - "y": 261.9309997558594 + "x": 493.875, + "y": 261.8240051269531 + }, + { + "x": 489.68798828125, + "y": 261.95599365234375 }, { "x": 485.5, "y": 262 }, { - "x": 480.2640075683594, - "y": 261.9309997558594 + "x": 481.3110046386719, + "y": 261.95599365234375 }, { - "x": 475.0320129394531, - "y": 261.7250061035156 + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 469.8080139160156, - "y": 261.38299560546875 + "x": 472.9410095214844, + "y": 261.6050109863281 + }, + { + "x": 468.7640075683594, + "y": 261.2980041503906 }, { "x": 464.593994140625, "y": 260.90399169921875 }, { - "x": 459.3940124511719, - "y": 260.2879943847656 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 454.2130126953125, - "y": 259.5369873046875 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 449.052001953125, - "y": 258.6499938964844 + "x": 452.14599609375, + "y": 259.1990051269531 + }, + { + "x": 448.02301025390625, + "y": 258.4570007324219 }, { "x": 443.9169921875, "y": 257.6289978027344 }, { - "x": 438.80999755859375, - "y": 256.4729919433594 + "x": 439.8290100097656, + "y": 256.7149963378906 }, { - "x": 433.7359924316406, - "y": 255.18499755859375 + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": 428.6960144042969, - "y": 253.76300048828125 + "x": 431.71600341796875, + "y": 254.6320037841797 + }, + { + "x": 427.6929931640625, + "y": 253.46299743652344 }, { "x": 423.6960144042969, "y": 252.21099853515625 }, { - "x": 418.7380065917969, - "y": 250.5279998779297 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": 413.82598876953125, - "y": 248.71600341796875 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": 408.9630126953125, - "y": 246.77499389648438 + "x": 411.875, + "y": 247.9550018310547 + }, + { + "x": 407.9960021972656, + "y": 246.3719940185547 }, { "x": 404.1520080566406, "y": 244.70899963378906 }, { - "x": 399.3970031738281, - "y": 242.51699829101562 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": 394.70098876953125, - "y": 240.2010040283203 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": 390.0679931640625, - "y": 237.76300048828125 + "x": 392.8399963378906, + "y": 239.24000549316406 + }, + { + "x": 389.14898681640625, + "y": 237.26100158691406 }, { "x": 385.5, "y": 235.2050018310547 }, { - "x": 381, - "y": 232.5279998779297 + "x": 381.8940124511719, + "y": 233.07200622558594 }, { - "x": 376.5719909667969, - "y": 229.73399353027344 + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": 372.2179870605469, - "y": 226.8249969482422 + "x": 374.8210144042969, + "y": 228.58399963378906 + }, + { + "x": 371.35699462890625, + "y": 226.22900390625 }, { "x": 367.9419860839844, "y": 223.80299377441406 }, { - "x": 363.74700927734375, - "y": 220.6699981689453 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": 359.635009765625, - "y": 217.4290008544922 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": 355.6099853515625, - "y": 214.08099365234375 + "x": 358.0150146484375, + "y": 216.1020050048828 + }, + { + "x": 354.81500244140625, + "y": 213.3990020751953 }, { "x": 351.6730041503906, "y": 210.6280059814453 }, { - "x": 347.8290100097656, - "y": 207.07400512695312 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": 344.0780029296875, - "y": 203.42100524902344 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": 340.42498779296875, - "y": 199.6699981689453 + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 }, { "x": 336.8710021972656, "y": 195.8260040283203 }, { - "x": 336.14599609375, + "x": 336.1419982910156, "y": 195 } ], @@ -2053,295 +2377,367 @@ "route": [ { "x": 931.4099731445312, - "y": -186.19900512695312 + "y": -186.21800231933594 }, { "x": 936.197021484375, "y": -185.53700256347656 }, { - "x": 943.927978515625, - "y": -184.15699768066406 + "x": 942.385986328125, + "y": -184.45700073242188 }, { - "x": 951.5989990234375, - "y": -182.47300720214844 + "x": 948.5380249023438, + "y": -183.18299865722656 }, { - "x": 959.197998046875, - "y": -180.49099731445312 + "x": 954.6480102539062, + "y": -181.71600341796875 + }, + { + "x": 960.7080078125, + "y": -180.05799865722656 }, { "x": 966.7130126953125, "y": -178.21099853515625 }, { - "x": 974.1329956054688, - "y": -175.63800048828125 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 981.4459838867188, - "y": -172.77499389648438 + "x": 978.5349731445312, + "y": -173.9550018310547 }, { - "x": 988.6420288085938, - "y": -169.6280059814453 + "x": 984.3389892578125, + "y": -171.5500030517578 + }, + { + "x": 990.0659790039062, + "y": -168.96499633789062 }, { "x": 995.7080078125, "y": -166.2010040283203 }, { - "x": 1002.6339721679688, - "y": -162.49899291992188 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 1009.4089965820312, - "y": -158.5279998779297 + "x": 1006.718017578125, + "y": -160.1479949951172 }, { - "x": 1016.0239868164062, - "y": -154.29299926757812 + "x": 1012.0750122070312, + "y": -156.86500549316406 + }, + { + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { "x": 1022.4669799804688, "y": -149.80299377441406 }, { - "x": 1028.72802734375, - "y": -145.06300354003906 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 1034.7989501953125, - "y": -140.08099365234375 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 1040.6700439453125, - "y": -134.86399841308594 + "x": 1037.1719970703125, + "y": -138.02200317382812 + }, + { + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { "x": 1046.3310546875, "y": -129.42100524902344 }, { - "x": 1051.7740478515625, - "y": -123.76000213623047 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 1056.990966796875, - "y": -117.88899993896484 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 1061.9730224609375, - "y": -111.81800079345703 + "x": 1059.011962890625, + "y": -115.48400115966797 + }, + { + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { "x": 1066.7130126953125, "y": -105.55699920654297 }, { - "x": 1071.2039794921875, - "y": -99.11399841308594 + "x": 1070.3260498046875, + "y": -100.41600036621094 }, { - "x": 1075.43798828125, - "y": -92.4990005493164 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 1079.4090576171875, - "y": -85.7239990234375 + "x": 1077.0579833984375, + "y": -89.80799865722656 + }, + { + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { "x": 1083.1109619140625, "y": -78.7979965209961 }, { - "x": 1086.5379638671875, - "y": -71.73100280761719 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 1089.68603515625, - "y": -64.53600311279297 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 1092.5479736328125, - "y": -57.222999572753906 + "x": 1090.864990234375, + "y": -61.624000549316406 + }, + { + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { "x": 1095.1209716796875, "y": -49.803001403808594 }, { - "x": 1097.4010009765625, - "y": -42.28799819946289 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 1099.384033203125, - "y": -34.68899917602539 + "x": 1098.6259765625, + "y": -37.73699951171875 }, { - "x": 1101.0670166015625, - "y": -27.01799964904785 + "x": 1100.093017578125, + "y": -31.628000259399414 + }, + { + "x": 1101.366943359375, + "y": -25.47599983215332 }, { "x": 1102.447021484375, "y": -19.285999298095703 }, { - "x": 1103.52294921875, - "y": -11.506999969482422 + "x": 1103.3330078125, + "y": -13.065999984741211 }, { - "x": 1104.29296875, - "y": -3.690999984741211 + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 1104.7550048828125, - "y": 4.1479997634887695 + "x": 1104.5150146484375, + "y": -0.5580000281333923 + }, + { + "x": 1104.81103515625, + "y": 5.7170000076293945 }, { "x": 1104.9100341796875, "y": 12 }, { - "x": 1104.7550048828125, - "y": 19.85099983215332 + "x": 1104.81103515625, + "y": 18.281999588012695 }, { - "x": 1104.29296875, - "y": 27.69099998474121 + "x": 1104.5150146484375, + "y": 24.558000564575195 }, { - "x": 1103.52294921875, - "y": 35.50699996948242 + "x": 1104.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1103.3330078125, + "y": 37.066001892089844 }, { "x": 1102.447021484375, "y": 43.2859992980957 }, { - "x": 1101.0670166015625, - "y": 51.018001556396484 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 1099.384033203125, - "y": 58.68899917602539 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 1097.4010009765625, - "y": 66.28800201416016 + "x": 1098.6259765625, + "y": 61.73699951171875 + }, + { + "x": 1096.968017578125, + "y": 67.7979965209961 }, { "x": 1095.1209716796875, "y": 73.8030014038086 }, { - "x": 1092.5479736328125, - "y": 81.2229995727539 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 1089.68603515625, - "y": 88.53600311279297 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 1086.5379638671875, - "y": 95.73100280761719 + "x": 1088.4610595703125, + "y": 91.42900085449219 + }, + { + "x": 1085.875, + "y": 97.15499877929688 }, { "x": 1083.1109619140625, "y": 102.7979965209961 }, { - "x": 1079.4090576171875, - "y": 109.7239990234375 + "x": 1080.1710205078125, + "y": 108.3499984741211 }, { - "x": 1075.43798828125, - "y": 116.4990005493164 + "x": 1077.0579833984375, + "y": 113.80799865722656 }, { - "x": 1071.2039794921875, - "y": 123.11399841308594 + "x": 1073.7750244140625, + "y": 119.16500091552734 + }, + { + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { "x": 1066.7130126953125, "y": 129.5570068359375 }, { - "x": 1061.9730224609375, - "y": 135.8179931640625 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 1056.990966796875, - "y": 141.88900756835938 + "x": 1059.011962890625, + "y": 139.48399353027344 }, { - "x": 1051.7740478515625, - "y": 147.75999450683594 + "x": 1054.9320068359375, + "y": 144.26199340820312 + }, + { + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { "x": 1046.3310546875, "y": 153.42100524902344 }, { - "x": 1040.6700439453125, - "y": 158.86399841308594 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 1034.7989501953125, - "y": 164.08099365234375 + "x": 1037.1719970703125, + "y": 162.02200317382812 }, { - "x": 1028.72802734375, - "y": 169.06300354003906 + "x": 1032.39404296875, + "y": 166.1020050048828 + }, + { + "x": 1027.490966796875, + "y": 170.031005859375 }, { "x": 1022.4669799804688, "y": 173.80299377441406 }, { - "x": 1016.0239868164062, - "y": 178.29299926757812 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 1009.4089965820312, - "y": 182.5279998779297 + "x": 1012.0750122070312, + "y": 180.86500549316406 }, { - "x": 1002.6339721679688, - "y": 186.49899291992188 + "x": 1006.718017578125, + "y": 184.1479949951172 + }, + { + "x": 1001.260009765625, + "y": 187.26100158691406 }, { "x": 995.7080078125, "y": 190.2010040283203 }, { - "x": 988.6420288085938, - "y": 193.6280059814453 + "x": 990.0659790039062, + "y": 192.96499633789062 }, { - "x": 981.4459838867188, - "y": 196.77499389648438 + "x": 984.3389892578125, + "y": 195.5500030517578 }, { - "x": 974.1329956054688, - "y": 199.63800048828125 + "x": 978.5349731445312, + "y": 197.9550018310547 + }, + { + "x": 972.656982421875, + "y": 200.17599487304688 }, { "x": 966.7130126953125, "y": 202.21099853515625 }, { - "x": 959.197998046875, - "y": 204.49099731445312 + "x": 960.7080078125, + "y": 204.05799865722656 }, { - "x": 951.5989990234375, - "y": 206.47300720214844 + "x": 954.6480102539062, + "y": 205.71600341796875 }, { - "x": 943.927978515625, - "y": 208.15699768066406 + "x": 948.5380249023438, + "y": 207.18299865722656 + }, + { + "x": 942.385986328125, + "y": 208.45700073242188 }, { "x": 936.197021484375, @@ -2349,7 +2745,7 @@ }, { "x": 931.4099731445312, - "y": 210.19900512695312 + "y": 210.21800231933594 } ], "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 f9882c89d..21e65f752 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-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .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-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab