diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index fbe855391..b1943b9eb 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -39,10 +39,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e return nil } -// calculateRadius now guards against a division-by-zero error when there is only one object. +// calculateRadius computes the required radius such that the chord between +// adjacent objects is at least (maxSize + 2*PADDING). We multiply the resulting +// radius by 1.1 (10% extra) to provide additional separation and avoid overlapping. func calculateRadius(objects []*d2graph.Object) float64 { if len(objects) < 2 { - // When there is a single object, we can simply use MIN_RADIUS. return MIN_RADIUS } numObjects := float64(len(objects)) @@ -51,8 +52,13 @@ func calculateRadius(objects []*d2graph.Object) float64 { size := math.Max(obj.Box.Width, obj.Box.Height) maxSize = math.Max(maxSize, size) } + // The chord between adjacent centers is 2*radius*sin(π/n). To ensure that + // chord >= maxSize + 2*PADDING, we require: + // radius >= (maxSize/2 + PADDING) / sin(π/n) minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) + // Use MIN_RADIUS as a lower bound and then add a 10% extra margin. + radius := math.Max(minRadius, MIN_RADIUS) + return radius * 1.1 } func positionObjects(objects []*d2graph.Object, radius float64) { @@ -60,7 +66,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { angleOffset := -math.Pi / 2 for i, obj := range objects { - angle := angleOffset + (2 * math.Pi * float64(i) / numObjects) + angle := angleOffset + (2*math.Pi*float64(i)/numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) obj.TopLeft = geo.NewPoint( @@ -167,7 +173,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * } return i, path[i] } - return len(path) - 1, path[len(path)-1] + return len(path)-1, path[len(path)-1] } // clampPointOutsideBoxReverse works similarly but in reverse order. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index a44184a6d..d35a95a78 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 453, - "height": 466, + "width": 493, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -233 + "y": -253 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 173, + "x": 193, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 167 + "y": 187 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -227, + "x": -247, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 513, - "y": 50 + "x": 553, + "y": 55 }, - "width": 399, - "height": 366, + "width": 434, + "height": 396, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 486, - "y": -183 + "x": 526, + "y": -198 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 659, - "y": 116 + "x": 717, + "y": 131 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 313, - "y": 117 + "x": 335, + "y": 132 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 972, + "x": 1047, "y": 0 }, "width": 53, - "height": 466, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 945, - "y": -233 + "x": 1020, + "y": -253 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 945, - "y": 167 + "x": 1020, + "y": 187 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 1085, + "x": 1160, "y": 0 }, - "width": 399, - "height": 466, + "width": 434, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 1058, - "y": -233 + "x": 1133, + "y": -253 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1231, - "y": -133 + "x": 1324, + "y": -143 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1231, - "y": 66 + "x": 1324, + "y": 76 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 1058, - "y": 167 + "x": 1133, + "y": 187 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 885, - "y": 67 + "x": 942, + "y": 77 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 886, - "y": -133 + "x": 943, + "y": -143 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1544, - "y": 20 + "x": 1654, + "y": 22 }, - "width": 433, - "height": 427, + "width": 471, + "height": 463, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1517, - "y": -213 + "x": 1627, + "y": -231 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1707, - "y": -74 + "x": 1836, + "y": -78 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1635, - "y": 148 + "x": 1756, + "y": 166 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1399, - "y": 148 + "x": 1497, + "y": 166 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1327, - "y": -74 + "x": 1418, + "y": -78 }, "width": 53, "height": 66, @@ -1085,334 +1085,342 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 + "y": -218.39199829101562 }, { - "x": 28.18000030517578, - "y": -198.00399780273438 + "x": 27.572999954223633, + "y": -218.26499938964844 }, { - "x": 31.285999298095703, - "y": -197.53700256347656 + "x": 30.99799919128418, + "y": -217.80499267578125 }, { - "x": 34.3849983215332, - "y": -197.02099609375 + "x": 34.415000915527344, + "y": -217.29100036621094 }, { - "x": 37.47600173950195, - "y": -196.45700073242188 + "x": 37.82400131225586, + "y": -216.7239990234375 }, { - "x": 40.55699920654297, - "y": -195.843994140625 + "x": 41.222999572753906, + "y": -216.10299682617188 }, { - "x": 43.62799835205078, - "y": -195.18299865722656 + "x": 44.612998962402344, + "y": -215.4290008544922 }, { - "x": 46.68899917602539, - "y": -194.47300720214844 + "x": 47.99100112915039, + "y": -214.7010040283203 }, { - "x": 49.73699951171875, - "y": -193.71600341796875 + "x": 51.356998443603516, + "y": -213.92100524902344 }, { - "x": 52.77399826049805, - "y": -192.91099548339844 + "x": 54.71099853515625, + "y": -213.08799743652344 }, { - "x": 55.79800033569336, - "y": -192.05799865722656 + "x": 58.051998138427734, + "y": -212.20199584960938 }, { - "x": 58.80799865722656, - "y": -191.1580047607422 + "x": 61.37799835205078, + "y": -211.26400756835938 }, { - "x": 61.803001403808594, - "y": -190.21099853515625 + "x": 64.68800354003906, + "y": -210.2740020751953 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 67.98300170898438, + "y": -209.23199462890625 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 71.26100158691406, + "y": -208.13800048828125 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 + "x": 74.52200317382812, + "y": -206.9929962158203 }, { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 77.76399993896484, + "y": -205.7969970703125 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 80.98699951171875, + "y": -204.5500030517578 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 + "x": 84.19000244140625, + "y": -203.2530059814453 }, { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 87.37200164794922, + "y": -201.906005859375 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 90.53299713134766, + "y": -200.50799560546875 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 93.6709976196289, + "y": -199.06100463867188 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 96.78600311279297, + "y": -197.5659942626953 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 + "x": 99.87699890136719, + "y": -196.02099609375 }, { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 102.94400024414062, + "y": -194.42799377441406 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 105.98500061035156, + "y": -192.78700256347656 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 109, + "y": -191.09800720214844 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 111.98899841308594, + "y": -189.36300659179688 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 114.9489974975586, + "y": -187.5800018310547 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 117.88099670410156, + "y": -185.7519989013672 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 + "x": 120.78500366210938, + "y": -183.8769989013672 }, { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 123.65799713134766, + "y": -181.95700073242188 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 126.5009994506836, + "y": -179.99200439453125 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 + "x": 129.31199645996094, + "y": -177.98300170898438 }, { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 132.0919952392578, + "y": -175.92999267578125 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 134.83900451660156, + "y": -173.83399963378906 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 137.55299377441406, + "y": -171.69400024414062 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 140.23300170898438, + "y": -169.51199340820312 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 142.8780059814453, + "y": -167.28900146484375 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 145.48800659179688, + "y": -165.0240020751953 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 + "x": 148.06199645996094, + "y": -162.71800231933594 }, { - "x": 139.1820068359375, - "y": -143.625 + "x": 150.60000610351562, + "y": -160.3730010986328 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 153.10000610351562, + "y": -157.98699951171875 }, { - "x": 143.625, - "y": -139.1820068359375 + "x": 155.56300354003906, + "y": -155.56300354003906 }, { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 157.98699951171875, + "y": -153.10000610351562 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 160.3730010986328, + "y": -150.60000610351562 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 162.71800231933594, + "y": -148.06199645996094 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 165.0240020751953, + "y": -145.48800659179688 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 167.28900146484375, + "y": -142.8780059814453 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 169.51199340820312, + "y": -140.23300170898438 }, { - "x": 158.031005859375, - "y": -122.58100128173828 + "x": 171.69400024414062, + "y": -137.55299377441406 }, { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 173.83399963378906, + "y": -134.83900451660156 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 175.92999267578125, + "y": -132.0919952392578 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 177.98300170898438, + "y": -129.31199645996094 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 179.99200439453125, + "y": -126.5009994506836 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 + "x": 181.95700073242188, + "y": -123.65799713134766 }, { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 183.8769989013672, + "y": -120.78500366210938 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 185.7519989013672, + "y": -117.88099670410156 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 + "x": 187.5800018310547, + "y": -114.9489974975586 }, { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 189.36300659179688, + "y": -111.98899841308594 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 191.09800720214844, + "y": -109 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 192.78700256347656, + "y": -105.98500061035156 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 194.42799377441406, + "y": -102.94400024414062 }, { - "x": 179.60499572753906, - "y": -87.98699951171875 + "x": 196.02099609375, + "y": -99.87699890136719 }, { - "x": 180.96499633789062, - "y": -85.15499877929688 + "x": 197.5659942626953, + "y": -96.78600311279297 }, { - "x": 182.27999877929688, - "y": -82.302001953125 + "x": 199.06100463867188, + "y": -93.6709976196289 }, { - "x": 183.5500030517578, - "y": -79.42900085449219 + "x": 200.50799560546875, + "y": -90.53299713134766 }, { - "x": 184.77499389648438, - "y": -76.53600311279297 + "x": 201.906005859375, + "y": -87.37200164794922 }, { - "x": 185.9550018310547, - "y": -73.6240005493164 + "x": 203.2530059814453, + "y": -84.19000244140625 }, { - "x": 187.08799743652344, - "y": -70.69400024414062 + "x": 204.5500030517578, + "y": -80.98699951171875 }, { - "x": 188.17599487304688, - "y": -67.74700164794922 + "x": 205.7969970703125, + "y": -77.76399993896484 }, { - "x": 189.2169952392578, - "y": -64.78299713134766 + "x": 206.9929962158203, + "y": -74.52200317382812 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 208.13800048828125, + "y": -71.26100158691406 }, { - "x": 191.1580047607422, - "y": -58.80799865722656 + "x": 209.23199462890625, + "y": -67.98300170898438 }, { - "x": 192.05799865722656, - "y": -55.79800033569336 + "x": 210.2740020751953, + "y": -64.68800354003906 }, { - "x": 192.91099548339844, - "y": -52.77399826049805 + "x": 211.26400756835938, + "y": -61.37799835205078 }, { - "x": 193.71600341796875, - "y": -49.73699951171875 + "x": 212.20199584960938, + "y": -58.051998138427734 }, { - "x": 194.47300720214844, - "y": -46.68899917602539 + "x": 213.08799743652344, + "y": -54.71099853515625 }, { - "x": 195.18299865722656, - "y": -43.62799835205078 + "x": 213.92100524902344, + "y": -51.356998443603516 }, { - "x": 195.843994140625, - "y": -40.55699920654297 + "x": 214.7010040283203, + "y": -47.99100112915039 }, { - "x": 196.45700073242188, - "y": -37.47600173950195 + "x": 215.4290008544922, + "y": -44.612998962402344 }, { - "x": 196.5659942626953, - "y": -37.10100173950195 + "x": 216.10299682617188, + "y": -41.222999572753906 }, { - "x": 197.2519989013672, + "x": 216.7239990234375, + "y": -37.82400131225586 + }, + { + "x": 216.8800048828125, + "y": -37.111000061035156 + }, + { + "x": 217.50399780273438, "y": -33 } ], @@ -1448,336 +1456,344 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 217.50399780273438, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 + "x": 217.29100036621094, + "y": 34.415000915527344 }, { - "x": 196.45700073242188, - "y": 37.47600173950195 + "x": 216.7239990234375, + "y": 37.82400131225586 }, { - "x": 195.843994140625, - "y": 40.55699920654297 + "x": 216.10299682617188, + "y": 41.222999572753906 }, { - "x": 195.18299865722656, - "y": 43.62799835205078 + "x": 215.4290008544922, + "y": 44.612998962402344 }, { - "x": 194.47300720214844, - "y": 46.68899917602539 + "x": 214.7010040283203, + "y": 47.99100112915039 }, { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 213.92100524902344, + "y": 51.356998443603516 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 213.08799743652344, + "y": 54.71099853515625 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 212.20199584960938, + "y": 58.051998138427734 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 211.26400756835938, + "y": 61.37799835205078 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 210.2740020751953, + "y": 64.68800354003906 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 209.23199462890625, + "y": 67.98300170898438 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 208.13800048828125, + "y": 71.26100158691406 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 206.9929962158203, + "y": 74.52200317382812 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 205.7969970703125, + "y": 77.76399993896484 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 204.5500030517578, + "y": 80.98699951171875 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 203.2530059814453, + "y": 84.19000244140625 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 201.906005859375, + "y": 87.37200164794922 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 200.50799560546875, + "y": 90.53299713134766 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 199.06100463867188, + "y": 93.6709976196289 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 197.5659942626953, + "y": 96.78600311279297 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 196.02099609375, + "y": 99.87699890136719 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 194.42799377441406, + "y": 102.94400024414062 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 192.78700256347656, + "y": 105.98500061035156 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 191.09800720214844, + "y": 109 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 189.36300659179688, + "y": 111.98899841308594 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 187.5800018310547, + "y": 114.9489974975586 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 185.7519989013672, + "y": 117.88099670410156 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 183.8769989013672, + "y": 120.78500366210938 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 181.95700073242188, + "y": 123.65799713134766 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 179.99200439453125, + "y": 126.5009994506836 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 177.98300170898438, + "y": 129.31199645996094 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 175.92999267578125, + "y": 132.0919952392578 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 173.83399963378906, + "y": 134.83900451660156 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 171.69400024414062, + "y": 137.55299377441406 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 169.51199340820312, + "y": 140.23300170898438 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 167.28900146484375, + "y": 142.8780059814453 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 165.0240020751953, + "y": 145.48800659179688 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 162.71800231933594, + "y": 148.06199645996094 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 160.3730010986328, + "y": 150.60000610351562 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 157.98699951171875, + "y": 153.10000610351562 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 155.56300354003906, + "y": 155.56300354003906 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 153.10000610351562, + "y": 157.98699951171875 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 150.60000610351562, + "y": 160.3730010986328 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 148.06199645996094, + "y": 162.71800231933594 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 145.48800659179688, + "y": 165.0240020751953 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 142.8780059814453, + "y": 167.28900146484375 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 140.23300170898438, + "y": 169.51199340820312 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 137.55299377441406, + "y": 171.69400024414062 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 134.83900451660156, + "y": 173.83399963378906 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 132.0919952392578, + "y": 175.92999267578125 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 129.31199645996094, + "y": 177.98300170898438 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 126.5009994506836, + "y": 179.99200439453125 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 123.65799713134766, + "y": 181.95700073242188 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 120.78500366210938, + "y": 183.8769989013672 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 117.88099670410156, + "y": 185.7519989013672 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 114.9489974975586, + "y": 187.5800018310547 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 111.98899841308594, + "y": 189.36300659179688 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 109, + "y": 191.09800720214844 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 105.98500061035156, + "y": 192.78700256347656 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 102.94400024414062, + "y": 194.42799377441406 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 + "x": 99.87699890136719, + "y": 196.02099609375 }, { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 96.78600311279297, + "y": 197.5659942626953 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 93.6709976196289, + "y": 199.06100463867188 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 90.53299713134766, + "y": 200.50799560546875 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 87.37200164794922, + "y": 201.906005859375 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 + "x": 84.19000244140625, + "y": 203.2530059814453 }, { - "x": 70.69400024414062, - "y": 187.08799743652344 + "x": 80.98699951171875, + "y": 204.5500030517578 }, { - "x": 67.74700164794922, - "y": 188.17599487304688 + "x": 77.76399993896484, + "y": 205.7969970703125 }, { - "x": 64.78299713134766, - "y": 189.2169952392578 + "x": 74.52200317382812, + "y": 206.9929962158203 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 71.26100158691406, + "y": 208.13800048828125 }, { - "x": 58.80799865722656, - "y": 191.1580047607422 + "x": 67.98300170898438, + "y": 209.23199462890625 }, { - "x": 55.79800033569336, - "y": 192.05799865722656 + "x": 64.68800354003906, + "y": 210.2740020751953 }, { - "x": 52.77399826049805, - "y": 192.91099548339844 + "x": 61.37799835205078, + "y": 211.26400756835938 }, { - "x": 49.73699951171875, - "y": 193.71600341796875 + "x": 58.051998138427734, + "y": 212.20199584960938 }, { - "x": 46.68899917602539, - "y": 194.47300720214844 + "x": 54.71099853515625, + "y": 213.08799743652344 }, { - "x": 43.62799835205078, - "y": 195.18299865722656 + "x": 51.356998443603516, + "y": 213.92100524902344 }, { - "x": 40.55699920654297, - "y": 195.843994140625 + "x": 47.99100112915039, + "y": 214.7010040283203 }, { - "x": 37.47600173950195, - "y": 196.45700073242188 + "x": 44.612998962402344, + "y": 215.4290008544922 }, { - "x": 34.3849983215332, - "y": 197.02099609375 + "x": 41.222999572753906, + "y": 216.10299682617188 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 37.82400131225586, + "y": 216.7239990234375 }, { - "x": 30.621999740600586, - "y": 197.6790008544922 + "x": 34.415000915527344, + "y": 217.29100036621094 + }, + { + "x": 30.99799919128418, + "y": 217.80499267578125 + }, + { + "x": 30.628000259399414, + "y": 217.89100646972656 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 218.39199829101562 } ], "isCurve": true, @@ -1813,334 +1829,342 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 + "y": 218.39199829101562 }, { - "x": -28.18000030517578, - "y": 198.00399780273438 + "x": -27.572999954223633, + "y": 218.26499938964844 }, { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": -30.99799919128418, + "y": 217.80499267578125 }, { - "x": -34.3849983215332, - "y": 197.02099609375 + "x": -34.415000915527344, + "y": 217.29100036621094 }, { - "x": -37.47600173950195, - "y": 196.45700073242188 + "x": -37.82400131225586, + "y": 216.7239990234375 }, { - "x": -40.55699920654297, - "y": 195.843994140625 + "x": -41.222999572753906, + "y": 216.10299682617188 }, { - "x": -43.62799835205078, - "y": 195.18299865722656 + "x": -44.612998962402344, + "y": 215.4290008544922 }, { - "x": -46.68899917602539, - "y": 194.47300720214844 + "x": -47.99100112915039, + "y": 214.7010040283203 }, { - "x": -49.73699951171875, - "y": 193.71600341796875 + "x": -51.356998443603516, + "y": 213.92100524902344 }, { - "x": -52.77399826049805, - "y": 192.91099548339844 + "x": -54.71099853515625, + "y": 213.08799743652344 }, { - "x": -55.79800033569336, - "y": 192.05799865722656 + "x": -58.051998138427734, + "y": 212.20199584960938 }, { - "x": -58.80799865722656, - "y": 191.1580047607422 + "x": -61.37799835205078, + "y": 211.26400756835938 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -64.68800354003906, + "y": 210.2740020751953 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -67.98300170898438, + "y": 209.23199462890625 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -71.26100158691406, + "y": 208.13800048828125 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 + "x": -74.52200317382812, + "y": 206.9929962158203 }, { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -77.76399993896484, + "y": 205.7969970703125 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -80.98699951171875, + "y": 204.5500030517578 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 + "x": -84.19000244140625, + "y": 203.2530059814453 }, { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -87.37200164794922, + "y": 201.906005859375 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -90.53299713134766, + "y": 200.50799560546875 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -93.6709976196289, + "y": 199.06100463867188 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -96.78600311279297, + "y": 197.5659942626953 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -99.87699890136719, + "y": 196.02099609375 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -102.94400024414062, + "y": 194.42799377441406 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 + "x": -105.98500061035156, + "y": 192.78700256347656 }, { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -109, + "y": 191.09800720214844 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -111.98899841308594, + "y": 189.36300659179688 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -114.9489974975586, + "y": 187.5800018310547 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -117.88099670410156, + "y": 185.7519989013672 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 + "x": -120.78500366210938, + "y": 183.8769989013672 }, { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -123.65799713134766, + "y": 181.95700073242188 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -126.5009994506836, + "y": 179.99200439453125 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 + "x": -129.31199645996094, + "y": 177.98300170898438 }, { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -132.0919952392578, + "y": 175.92999267578125 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -134.83900451660156, + "y": 173.83399963378906 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -137.55299377441406, + "y": 171.69400024414062 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -140.23300170898438, + "y": 169.51199340820312 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -142.8780059814453, + "y": 167.28900146484375 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -145.48800659179688, + "y": 165.0240020751953 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 + "x": -148.06199645996094, + "y": 162.71800231933594 }, { - "x": -139.1820068359375, - "y": 143.625 + "x": -150.60000610351562, + "y": 160.3730010986328 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -153.10000610351562, + "y": 157.98699951171875 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -155.56300354003906, + "y": 155.56300354003906 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -157.98699951171875, + "y": 153.10000610351562 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 + "x": -160.3730010986328, + "y": 150.60000610351562 }, { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -162.71800231933594, + "y": 148.06199645996094 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -165.0240020751953, + "y": 145.48800659179688 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 + "x": -167.28900146484375, + "y": 142.8780059814453 }, { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -169.51199340820312, + "y": 140.23300170898438 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -171.69400024414062, + "y": 137.55299377441406 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -173.83399963378906, + "y": 134.83900451660156 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -175.92999267578125, + "y": 132.0919952392578 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -177.98300170898438, + "y": 129.31199645996094 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -179.99200439453125, + "y": 126.5009994506836 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 + "x": -181.95700073242188, + "y": 123.65799713134766 }, { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -183.8769989013672, + "y": 120.78500366210938 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -185.7519989013672, + "y": 117.88099670410156 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 + "x": -187.5800018310547, + "y": 114.9489974975586 }, { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -189.36300659179688, + "y": 111.98899841308594 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -191.09800720214844, + "y": 109 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -192.78700256347656, + "y": 105.98500061035156 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -194.42799377441406, + "y": 102.94400024414062 }, { - "x": -179.60499572753906, - "y": 87.98699951171875 + "x": -196.02099609375, + "y": 99.87699890136719 }, { - "x": -180.96499633789062, - "y": 85.15499877929688 + "x": -197.5659942626953, + "y": 96.78600311279297 }, { - "x": -182.27999877929688, - "y": 82.302001953125 + "x": -199.06100463867188, + "y": 93.6709976196289 }, { - "x": -183.5500030517578, - "y": 79.42900085449219 + "x": -200.50799560546875, + "y": 90.53299713134766 }, { - "x": -184.77499389648438, - "y": 76.53600311279297 + "x": -201.906005859375, + "y": 87.37200164794922 }, { - "x": -185.9550018310547, - "y": 73.6240005493164 + "x": -203.2530059814453, + "y": 84.19000244140625 }, { - "x": -187.08799743652344, - "y": 70.69400024414062 + "x": -204.5500030517578, + "y": 80.98699951171875 }, { - "x": -188.17599487304688, - "y": 67.74700164794922 + "x": -205.7969970703125, + "y": 77.76399993896484 }, { - "x": -189.2169952392578, - "y": 64.78299713134766 + "x": -206.9929962158203, + "y": 74.52200317382812 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -208.13800048828125, + "y": 71.26100158691406 }, { - "x": -191.1580047607422, - "y": 58.80799865722656 + "x": -209.23199462890625, + "y": 67.98300170898438 }, { - "x": -192.05799865722656, - "y": 55.79800033569336 + "x": -210.2740020751953, + "y": 64.68800354003906 }, { - "x": -192.91099548339844, - "y": 52.77399826049805 + "x": -211.26400756835938, + "y": 61.37799835205078 }, { - "x": -193.71600341796875, - "y": 49.73699951171875 + "x": -212.20199584960938, + "y": 58.051998138427734 }, { - "x": -194.47300720214844, - "y": 46.68899917602539 + "x": -213.08799743652344, + "y": 54.71099853515625 }, { - "x": -195.18299865722656, - "y": 43.62799835205078 + "x": -213.92100524902344, + "y": 51.356998443603516 }, { - "x": -195.843994140625, - "y": 40.55699920654297 + "x": -214.7010040283203, + "y": 47.99100112915039 }, { - "x": -196.45700073242188, - "y": 37.47600173950195 + "x": -215.4290008544922, + "y": 44.612998962402344 }, { - "x": -196.5659942626953, - "y": 37.10100173950195 + "x": -216.10299682617188, + "y": 41.222999572753906 }, { - "x": -197.2519989013672, + "x": -216.7239990234375, + "y": 37.82400131225586 + }, + { + "x": -216.8800048828125, + "y": 37.111000061035156 + }, + { + "x": -217.50399780273438, "y": 33 } ], @@ -2176,352 +2200,360 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 + "x": 579.5, + "y": -163.38900756835938 }, { - "x": 542.2160034179688, - "y": -147.85400390625 + "x": 580.572998046875, + "y": -163.26499938964844 }, { - "x": 546.35302734375, - "y": -147.19900512695312 + "x": 585.1380004882812, + "y": -162.63900756835938 }, { - "x": 550.4760131835938, - "y": -146.45700073242188 + "x": 589.6890258789062, + "y": -161.91900634765625 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 594.2230224609375, + "y": -161.10299682617188 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 598.739990234375, + "y": -160.19200134277344 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 603.2369995117188, + "y": -159.18699645996094 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 + "x": 607.7109985351562, + "y": -158.08799743652344 }, { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 612.1619873046875, + "y": -156.89500427246094 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 616.5859985351562, + "y": -155.61000061035156 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 620.9829711914062, + "y": -154.23199462890625 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 625.3499755859375, + "y": -152.76199340820312 }, { - "x": 586.6240234375, - "y": -135.9550018310547 + "x": 629.6849975585938, + "y": -151.20199584960938 }, { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 633.9869995117188, + "y": -149.5500030517578 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 638.2529907226562, + "y": -147.8090057373047 }, { - "x": 598.155029296875, - "y": -130.96499633789062 + "x": 642.4819946289062, + "y": -145.97999572753906 }, { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 646.6710205078125, + "y": -144.06100463867188 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 650.8189697265625, + "y": -142.05599975585938 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 654.9249877929688, + "y": -139.96400451660156 }, { - "x": 613, - "y": -123.20500183105469 + "x": 658.9849853515625, + "y": -137.78700256347656 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 663, + "y": -135.52499389648438 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 666.9650268554688, + "y": -133.17999267578125 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 670.8809814453125, + "y": -130.7519989013672 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 674.7459716796875, + "y": -128.24200439453125 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 678.5560302734375, + "y": -125.6520004272461 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 682.31201171875, + "y": -122.98300170898438 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 686.010986328125, + "y": -120.23600006103516 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 689.6519775390625, + "y": -117.41200256347656 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 693.2329711914062, + "y": -114.51200103759766 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 696.7520141601562, + "y": -111.53800201416016 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 700.2080078125, + "y": -108.49099731445312 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 703.5999755859375, + "y": -105.37300109863281 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 706.9249877929688, + "y": -102.18299865722656 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 710.1829833984375, + "y": -98.92500305175781 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 713.3729858398438, + "y": -95.5999984741211 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 716.4910278320312, + "y": -92.20800018310547 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 719.5380249023438, + "y": -88.75199890136719 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 722.5120239257812, + "y": -85.23300170898438 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 725.4119873046875, + "y": -81.6520004272461 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 728.2360229492188, + "y": -78.01100158691406 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 730.9829711914062, + "y": -74.31199645996094 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 733.6519775390625, + "y": -70.55599975585938 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 736.2420043945312, + "y": -66.74600219726562 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 738.7520141601562, + "y": -62.88100051879883 }, { - "x": 686.2050170898438, - "y": -50 + "x": 741.1799926757812, + "y": -58.96500015258789 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 743.5250244140625, + "y": -55 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 745.7869873046875, + "y": -50.98500061035156 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 747.9639892578125, + "y": -46.92499923706055 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 750.0560302734375, + "y": -42.819000244140625 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 752.0609741210938, + "y": -38.67100143432617 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 753.97998046875, + "y": -34.481998443603516 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 755.8090209960938, + "y": -30.253000259399414 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 757.5499877929688, + "y": -25.98699951171875 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 759.2020263671875, + "y": -21.684999465942383 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 760.7620239257812, + "y": -17.350000381469727 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 762.2319946289062, + "y": -12.982999801635742 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 763.6099853515625, + "y": -8.586000442504883 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 764.89501953125, + "y": -4.1620001792907715 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 766.0880126953125, + "y": 0.2879999876022339 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 767.18701171875, + "y": 4.76200008392334 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 768.1920166015625, + "y": 9.258999824523926 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 769.10302734375, + "y": 13.776000022888184 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 769.9190063476562, + "y": 18.309999465942383 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 770.6389770507812, + "y": 22.861000061035156 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 771.2650146484375, + "y": 27.426000595092773 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 771.7940063476562, + "y": 32.00299835205078 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 772.22802734375, + "y": 36.59000015258789 }, { - "x": 712.823974609375, - "y": 41.624000549316406 + "x": 772.5650024414062, + "y": 41.18600082397461 }, { - "x": 712.9559936523438, - "y": 45.81100082397461 + "x": 772.8070068359375, + "y": 45.7869987487793 }, { - "x": 713, - "y": 50 + "x": 772.9509887695312, + "y": 50.391998291015625 }, { - "x": 712.9559936523438, - "y": 54.1879997253418 + "x": 773, + "y": 55 }, { - "x": 712.823974609375, - "y": 58.375 + "x": 772.9509887695312, + "y": 59.606998443603516 }, { - "x": 712.60498046875, - "y": 62.55799865722656 + "x": 772.8070068359375, + "y": 64.21199798583984 }, { - "x": 712.2979736328125, - "y": 66.73500061035156 + "x": 772.5650024414062, + "y": 68.81300354003906 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 772.22802734375, + "y": 73.40899658203125 }, { - "x": 711.4219970703125, - "y": 75.06600189208984 + "x": 771.7940063476562, + "y": 77.99600219726562 }, { - "x": 710.85400390625, - "y": 79.21600341796875 + "x": 771.2650146484375, + "y": 82.572998046875 }, { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 770.6389770507812, + "y": 87.13800048828125 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 769.9190063476562, + "y": 91.68900299072266 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 769.10302734375, + "y": 96.2229995727539 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 768.1920166015625, + "y": 100.73999786376953 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 767.18701171875, + "y": 105.23699951171875 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 + "x": 766.0880126953125, + "y": 109.71099853515625 }, { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 764.89501953125, + "y": 114.16200256347656 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 763.6099853515625, + "y": 118.58599853515625 }, { - "x": 702.8259887695312, - "y": 113.08100128173828 + "x": 762.2319946289062, + "y": 122.98300170898438 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 760.7620239257812, + "y": 127.3499984741211 + }, + { + "x": 760.5369873046875, + "y": 128.10400390625 + }, + { + "x": 759.0809936523438, + "y": 131.99899291992188 } ], "isCurve": true, @@ -2556,336 +2588,344 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 + "x": 720.1740112304688, + "y": 197.99899291992188 }, { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 719.5380249023438, + "y": 198.7519989013672 }, { - "x": 658.7930297851562, - "y": 186.90899658203125 + "x": 716.4910278320312, + "y": 202.20799255371094 }, { - "x": 655.8939819335938, - "y": 189.9320068359375 + "x": 713.3729858398438, + "y": 205.60000610351562 }, { - "x": 652.9320068359375, - "y": 192.8939971923828 + "x": 710.1829833984375, + "y": 208.9250030517578 }, { - "x": 649.9089965820312, - "y": 195.79299926757812 + "x": 706.9249877929688, + "y": 212.18299865722656 }, { - "x": 646.8259887695312, - "y": 198.6280059814453 + "x": 703.5999755859375, + "y": 215.3730010986328 }, { - "x": 643.6840209960938, - "y": 201.3990020751953 + "x": 700.2080078125, + "y": 218.49099731445312 }, { - "x": 640.4840087890625, - "y": 204.1020050048828 + "x": 696.7520141601562, + "y": 221.53799438476562 }, { - "x": 637.22900390625, - "y": 206.73800659179688 + "x": 693.2329711914062, + "y": 224.51199340820312 }, { - "x": 633.9190063476562, - "y": 209.30499267578125 + "x": 689.6519775390625, + "y": 227.41200256347656 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 686.010986328125, + "y": 230.23599243164062 }, { - "x": 627.1420288085938, - "y": 214.22900390625 + "x": 682.31201171875, + "y": 232.98300170898438 }, { - "x": 623.677978515625, - "y": 216.58399963378906 + "x": 678.5560302734375, + "y": 235.65199279785156 }, { - "x": 620.1649780273438, - "y": 218.86500549316406 + "x": 674.7459716796875, + "y": 238.24200439453125 }, { - "x": 616.60498046875, - "y": 221.07200622558594 + "x": 670.8809814453125, + "y": 240.7519989013672 }, { - "x": 613, - "y": 223.2050018310547 + "x": 666.9650268554688, + "y": 243.17999267578125 }, { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 663, + "y": 245.52499389648438 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 658.9849853515625, + "y": 247.78700256347656 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 654.9249877929688, + "y": 249.96400451660156 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 650.8189697265625, + "y": 252.05599975585938 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 646.6710205078125, + "y": 254.06100463867188 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 642.4819946289062, + "y": 255.97999572753906 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 638.2529907226562, + "y": 257.8089904785156 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 633.9869995117188, + "y": 259.54998779296875 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 629.6849975585938, + "y": 261.2019958496094 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 625.3499755859375, + "y": 262.7619934082031 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 620.9829711914062, + "y": 264.23199462890625 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 616.5859985351562, + "y": 265.6099853515625 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 612.1619873046875, + "y": 266.8949890136719 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 607.7109985351562, + "y": 268.0880126953125 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 603.2369995117188, + "y": 269.18701171875 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 598.739990234375, + "y": 270.1919860839844 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 594.2230224609375, + "y": 271.1029968261719 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 589.6890258789062, + "y": 271.91900634765625 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 585.1380004882812, + "y": 272.6390075683594 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 580.572998046875, + "y": 273.2650146484375 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 575.9959716796875, + "y": 273.79400634765625 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 571.4089965820312, + "y": 274.2279968261719 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 566.81298828125, + "y": 274.56500244140625 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 562.2119750976562, + "y": 274.8070068359375 }, { - "x": 513, - "y": 250 + "x": 557.6069946289062, + "y": 274.95098876953125 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 553, + "y": 275 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 548.3920288085938, + "y": 274.95098876953125 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 543.7869873046875, + "y": 274.8070068359375 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 539.1859741210938, + "y": 274.56500244140625 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 534.5900268554688, + "y": 274.2279968261719 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 530.0029907226562, + "y": 273.79400634765625 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 525.426025390625, + "y": 273.2650146484375 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 520.8610229492188, + "y": 272.6390075683594 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 516.3099975585938, + "y": 271.91900634765625 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 511.7760009765625, + "y": 271.1029968261719 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 507.2590026855469, + "y": 270.1919860839844 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 502.7619934082031, + "y": 269.18701171875 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 498.2879943847656, + "y": 268.0880126953125 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 493.8370056152344, + "y": 266.8949890136719 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 489.4129943847656, + "y": 265.6099853515625 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 485.0159912109375, + "y": 264.23199462890625 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 480.64898681640625, + "y": 262.7619934082031 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 476.3139953613281, + "y": 261.2019958496094 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 472.0119934082031, + "y": 259.54998779296875 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 467.7460021972656, + "y": 257.8089904785156 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 463.5169982910156, + "y": 255.97999572753906 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 459.3280029296875, + "y": 254.06100463867188 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 + "x": 455.17999267578125, + "y": 252.05599975585938 }, { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 451.0740051269531, + "y": 249.96400451660156 }, { - "x": 413, - "y": 223.2050018310547 + "x": 447.0140075683594, + "y": 247.78700256347656 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 + "x": 443, + "y": 245.52499389648438 }, { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 439.03399658203125, + "y": 243.17999267578125 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 435.1180114746094, + "y": 240.7519989013672 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 431.25299072265625, + "y": 238.24200439453125 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 427.4429931640625, + "y": 235.65199279785156 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 423.68701171875, + "y": 232.98300170898438 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 419.9880065917969, + "y": 230.23599243164062 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 + "x": 416.34698486328125, + "y": 227.41200256347656 }, { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 412.7659912109375, + "y": 224.51199340820312 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 409.24700927734375, + "y": 221.53799438476562 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 405.7909851074219, + "y": 218.49099731445312 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 402.39898681640625, + "y": 215.3730010986328 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 + "x": 399.0740051269531, + "y": 212.18299865722656 }, { - "x": 367.20599365234375, - "y": 186.90899658203125 + "x": 395.8160095214844, + "y": 208.9250030517578 }, { - "x": 366.4079895019531, - "y": 186.1060028076172 + "x": 392.6260070800781, + "y": 205.60000610351562 }, { - "x": 363.6419982910156, - "y": 183 + "x": 389.50799560546875, + "y": 202.20799255371094 + }, + { + "x": 388.52801513671875, + "y": 201.16000366210938 + }, + { + "x": 385.82501220703125, + "y": 198 } ], "isCurve": true, @@ -2920,376 +2960,384 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 + "x": 1073.5, + "y": -218.38299560546875 }, { - "x": 1003.2860107421875, - "y": -197.53700256347656 + "x": 1074.572998046875, + "y": -218.26499938964844 }, { - "x": 1009.4760131835938, - "y": -196.45700073242188 + "x": 1081.4150390625, + "y": -217.29100036621094 }, { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 1088.2230224609375, + "y": -216.10299682617188 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 1094.990966796875, + "y": -214.7010040283203 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 1101.7110595703125, + "y": -213.08799743652344 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1108.3780517578125, + "y": -211.26400756835938 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 1114.9830322265625, + "y": -209.23199462890625 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 1121.52197265625, + "y": -206.9929962158203 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 1127.987060546875, + "y": -204.5500030517578 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 1134.3719482421875, + "y": -201.906005859375 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 1140.6710205078125, + "y": -199.06100463867188 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 1146.876953125, + "y": -196.02099609375 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 1152.9849853515625, + "y": -192.78700256347656 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 1158.989013671875, + "y": -189.36300659179688 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 1164.8809814453125, + "y": -185.7519989013672 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1170.657958984375, + "y": -181.95700073242188 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 1176.31201171875, + "y": -177.98300170898438 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 1181.8389892578125, + "y": -173.83399963378906 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 1187.2330322265625, + "y": -169.51199340820312 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 1192.488037109375, + "y": -165.0240020751953 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 1197.5999755859375, + "y": -160.3730010986328 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 1202.56298828125, + "y": -155.56300354003906 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 1207.373046875, + "y": -150.60000610351562 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 1212.0240478515625, + "y": -145.48800659179688 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 1216.511962890625, + "y": -140.23300170898438 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 1220.833984375, + "y": -134.83900451660156 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 1224.9830322265625, + "y": -129.31199645996094 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 1228.95703125, + "y": -123.65799713134766 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 1232.751953125, + "y": -117.88099670410156 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 1236.363037109375, + "y": -111.98899841308594 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 1239.7869873046875, + "y": -105.98500061035156 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 1243.02099609375, + "y": -99.87699890136719 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 1246.06103515625, + "y": -93.6709976196289 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 1248.906005859375, + "y": -87.37200164794922 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 1251.550048828125, + "y": -80.98699951171875 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1253.9930419921875, + "y": -74.52200317382812 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 1256.2320556640625, + "y": -67.98300170898438 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 1258.2640380859375, + "y": -61.37799835205078 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 1260.0880126953125, + "y": -54.71099853515625 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 1261.7010498046875, + "y": -47.99100112915039 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 1263.10302734375, + "y": -41.222999572753906 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 + "x": 1264.291015625, + "y": -34.415000915527344 }, { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 1265.2650146484375, + "y": -27.572999954223633 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 1266.02294921875, + "y": -20.702999114990234 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 + "x": 1266.56494140625, + "y": -13.812999725341797 }, { - "x": 1172, + "x": 1266.8909912109375, + "y": -6.909999847412109 + }, + { + "x": 1267, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 + "x": 1266.8909912109375, + "y": 6.909999847412109 }, { - "x": 1171.60498046875, - "y": 12.557999610900879 + "x": 1266.56494140625, + "y": 13.812999725341797 }, { - "x": 1171.112060546875, - "y": 18.820999145507812 + "x": 1266.02294921875, + "y": 20.702999114990234 }, { - "x": 1170.4219970703125, - "y": 25.06599998474121 + "x": 1265.2650146484375, + "y": 27.572999954223633 }, { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 1264.291015625, + "y": 34.415000915527344 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 1263.10302734375, + "y": 41.222999572753906 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 1261.7010498046875, + "y": 47.99100112915039 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 1260.0880126953125, + "y": 54.71099853515625 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 1258.2640380859375, + "y": 61.37799835205078 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1256.2320556640625, + "y": 67.98300170898438 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 1253.9930419921875, + "y": 74.52200317382812 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 1251.550048828125, + "y": 80.98699951171875 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 1248.906005859375, + "y": 87.37200164794922 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 1246.06103515625, + "y": 93.6709976196289 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 1243.02099609375, + "y": 99.87699890136719 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 1239.7869873046875, + "y": 105.98500061035156 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 1236.363037109375, + "y": 111.98899841308594 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 1232.751953125, + "y": 117.88099670410156 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 1228.95703125, + "y": 123.65799713134766 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1224.9830322265625, + "y": 129.31199645996094 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 1220.833984375, + "y": 134.83900451660156 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 1216.511962890625, + "y": 140.23300170898438 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 1212.0240478515625, + "y": 145.48800659179688 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 1207.373046875, + "y": 150.60000610351562 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 1202.56298828125, + "y": 155.56300354003906 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 1197.5999755859375, + "y": 160.3730010986328 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 1192.488037109375, + "y": 165.0240020751953 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 1187.2330322265625, + "y": 169.51199340820312 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 1181.8389892578125, + "y": 173.83399963378906 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1176.31201171875, + "y": 177.98300170898438 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 1170.657958984375, + "y": 181.95700073242188 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 1164.8809814453125, + "y": 185.7519989013672 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 1158.989013671875, + "y": 189.36300659179688 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 1152.9849853515625, + "y": 192.78700256347656 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 1146.876953125, + "y": 196.02099609375 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 1140.6710205078125, + "y": 199.06100463867188 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 1134.3719482421875, + "y": 201.906005859375 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 1127.987060546875, + "y": 204.5500030517578 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 1121.52197265625, + "y": 206.9929962158203 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 1114.9830322265625, + "y": 209.23199462890625 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 1108.3780517578125, + "y": 211.26400756835938 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 + "x": 1101.7110595703125, + "y": 213.08799743652344 }, { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 1094.990966796875, + "y": 214.7010040283203 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 1088.2230224609375, + "y": 216.10299682617188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1081.4150390625, + "y": 217.29100036621094 }, { - "x": 998.5, - "y": 198.21800231933594 + "x": 1077.6280517578125, + "y": 217.8820037841797 + }, + { + "x": 1073.5, + "y": 218.38299560546875 } ], "isCurve": true, @@ -3324,284 +3372,296 @@ "link": "", "route": [ { - "x": 1111.5, - "y": -198.23399353027344 + "x": 1186.5, + "y": -218.39500427246094 }, { - "x": 1112.1429443359375, - "y": -198.1490020751953 + "x": 1187.572998046875, + "y": -218.26499938964844 }, { - "x": 1114.2159423828125, - "y": -197.85400390625 + "x": 1189.8570556640625, + "y": -217.96400451660156 }, { - "x": 1116.2860107421875, - "y": -197.53700256347656 + "x": 1192.137939453125, + "y": -217.63900756835938 }, { - "x": 1118.35302734375, - "y": -197.19900512695312 + "x": 1194.4150390625, + "y": -217.29100036621094 }, { - "x": 1120.416015625, - "y": -196.83900451660156 + "x": 1196.68896484375, + "y": -216.91900634765625 }, { - "x": 1122.4759521484375, - "y": -196.45700073242188 + "x": 1198.9580078125, + "y": -216.5229949951172 }, { - "x": 1124.531005859375, - "y": -196.0540008544922 + "x": 1201.2230224609375, + "y": -216.10299682617188 }, { - "x": 1126.58203125, - "y": -195.62899780273438 + "x": 1203.4840087890625, + "y": -215.65899658203125 }, { - "x": 1128.6280517578125, - "y": -195.18299865722656 + "x": 1205.739990234375, + "y": -215.19200134277344 }, { - "x": 1130.6700439453125, - "y": -194.71499633789062 + "x": 1207.990966796875, + "y": -214.7010040283203 }, { - "x": 1132.7060546875, - "y": -194.2259979248047 + "x": 1210.237060546875, + "y": -214.18699645996094 }, { - "x": 1134.737060546875, - "y": -193.71600341796875 + "x": 1212.47705078125, + "y": -213.6490020751953 }, { - "x": 1136.762939453125, - "y": -193.18499755859375 + "x": 1214.7110595703125, + "y": -213.08799743652344 }, { - "x": 1138.782958984375, - "y": -192.6320037841797 + "x": 1216.93994140625, + "y": -212.5030059814453 }, { - "x": 1140.7979736328125, - "y": -192.05799865722656 + "x": 1219.1619873046875, + "y": -211.89500427246094 }, { - "x": 1142.8060302734375, - "y": -191.46299743652344 + "x": 1221.3780517578125, + "y": -211.26400756835938 }, { - "x": 1144.8079833984375, - "y": -190.84800720214844 + "x": 1223.5860595703125, + "y": -210.61000061035156 }, { - "x": 1146.802978515625, - "y": -190.21099853515625 + "x": 1225.7879638671875, + "y": -209.9320068359375 }, { - "x": 1148.791015625, - "y": -189.55299377441406 + "x": 1227.9830322265625, + "y": -209.23199462890625 }, { - "x": 1150.77294921875, - "y": -188.875 + "x": 1230.1710205078125, + "y": -208.50900268554688 }, { - "x": 1152.7469482421875, - "y": -188.17599487304688 + "x": 1232.3499755859375, + "y": -207.76199340820312 }, { - "x": 1154.7139892578125, - "y": -187.45599365234375 + "x": 1234.52197265625, + "y": -206.9929962158203 }, { - "x": 1156.6729736328125, - "y": -186.71600341796875 + "x": 1236.68505859375, + "y": -206.20199584960938 }, { - "x": 1158.6240234375, - "y": -185.9550018310547 + "x": 1238.8399658203125, + "y": -205.38699340820312 }, { - "x": 1160.5679931640625, - "y": -185.1739959716797 + "x": 1240.987060546875, + "y": -204.5500030517578 }, { - "x": 1162.5030517578125, - "y": -184.3719940185547 + "x": 1243.1240234375, + "y": -203.6909942626953 }, { - "x": 1164.428955078125, - "y": -183.5500030517578 + "x": 1245.2530517578125, + "y": -202.8090057373047 }, { - "x": 1166.3470458984375, - "y": -182.70899963378906 + "x": 1247.3719482421875, + "y": -201.906005859375 }, { - "x": 1168.2559814453125, - "y": -181.8470001220703 + "x": 1249.4820556640625, + "y": -200.97999572753906 }, { - "x": 1170.155029296875, - "y": -180.96499633789062 + "x": 1251.5810546875, + "y": -200.031005859375 }, { - "x": 1172.0460205078125, - "y": -180.06300354003906 + "x": 1253.6710205078125, + "y": -199.06100463867188 }, { - "x": 1173.927001953125, - "y": -179.14199829101562 + "x": 1255.75, + "y": -198.07000732421875 }, { - "x": 1175.7979736328125, - "y": -178.2010040283203 + "x": 1257.8189697265625, + "y": -197.05599975585938 }, { - "x": 1177.6590576171875, - "y": -177.24000549316406 + "x": 1259.876953125, + "y": -196.02099609375 }, { - "x": 1179.510009765625, - "y": -176.25999450683594 + "x": 1261.925048828125, + "y": -194.96400451660156 }, { - "x": 1181.3499755859375, - "y": -175.26100158691406 + "x": 1263.9610595703125, + "y": -193.88600158691406 }, { - "x": 1183.1800537109375, - "y": -174.24200439453125 + "x": 1265.9849853515625, + "y": -192.78700256347656 }, { - "x": 1185, - "y": -173.2050018310547 + "x": 1267.998046875, + "y": -191.66700744628906 }, { - "x": 1186.8079833984375, - "y": -172.1479949951172 + "x": 1270, + "y": -190.52499389648438 }, { - "x": 1188.60498046875, - "y": -171.07200622558594 + "x": 1271.989013671875, + "y": -189.36300659179688 }, { - "x": 1190.3909912109375, - "y": -169.97799682617188 + "x": 1273.9649658203125, + "y": -188.17999267578125 }, { - "x": 1192.1650390625, - "y": -168.86500549316406 + "x": 1275.9300537109375, + "y": -186.9759979248047 }, { - "x": 1193.927001953125, - "y": -167.73399353027344 + "x": 1277.8809814453125, + "y": -185.7519989013672 }, { - "x": 1195.677978515625, - "y": -166.58399963378906 + "x": 1279.8199462890625, + "y": -184.5070037841797 }, { - "x": 1197.416015625, - "y": -165.41600036621094 + "x": 1281.7459716796875, + "y": -183.24200439453125 }, { - "x": 1199.1419677734375, - "y": -164.22900390625 + "x": 1283.657958984375, + "y": -181.95700073242188 }, { - "x": 1200.85595703125, - "y": -163.02499389648438 + "x": 1285.5560302734375, + "y": -180.65199279785156 }, { - "x": 1202.5570068359375, - "y": -161.80299377441406 + "x": 1287.4410400390625, + "y": -179.3280029296875 }, { - "x": 1204.2440185546875, - "y": -160.56300354003906 + "x": 1289.31201171875, + "y": -177.98300170898438 }, { - "x": 1205.9189453125, - "y": -159.30499267578125 + "x": 1291.1689453125, + "y": -176.61900329589844 }, { - "x": 1207.5810546875, - "y": -158.031005859375 + "x": 1293.010986328125, + "y": -175.23599243164062 }, { - "x": 1209.22900390625, - "y": -156.73800659179688 + "x": 1294.8389892578125, + "y": -173.83399963378906 }, { - "x": 1210.864013671875, - "y": -155.4290008544922 + "x": 1296.6519775390625, + "y": -172.41200256347656 }, { - "x": 1212.4840087890625, - "y": -154.1020050048828 + "x": 1298.449951171875, + "y": -170.9720001220703 }, { - "x": 1214.0909423828125, - "y": -152.75900268554688 + "x": 1300.2330322265625, + "y": -169.51199340820312 }, { - "x": 1215.6839599609375, - "y": -151.3990020751953 + "x": 1302, + "y": -168.03500366210938 }, { - "x": 1217.261962890625, - "y": -150.02200317382812 + "x": 1303.751953125, + "y": -166.53799438476562 }, { - "x": 1218.8260498046875, - "y": -148.6280059814453 + "x": 1305.488037109375, + "y": -165.0240020751953 }, { - "x": 1220.375, - "y": -147.218994140625 + "x": 1307.2080078125, + "y": -163.49099731445312 }, { - "x": 1221.9090576171875, - "y": -145.79299926757812 + "x": 1308.9119873046875, + "y": -161.9409942626953 }, { - "x": 1223.427978515625, - "y": -144.3520050048828 + "x": 1310.5999755859375, + "y": -160.3730010986328 }, { - "x": 1224.9320068359375, - "y": -142.8939971923828 + "x": 1312.27099609375, + "y": -158.78700256347656 }, { - "x": 1226.4210205078125, - "y": -141.42100524902344 + "x": 1313.925048828125, + "y": -157.18299865722656 }, { - "x": 1227.89404296875, - "y": -139.9320068359375 + "x": 1315.56298828125, + "y": -155.56300354003906 }, { - "x": 1229.35205078125, - "y": -138.42799377441406 + "x": 1317.1829833984375, + "y": -153.9250030517578 }, { - "x": 1230.79296875, - "y": -136.90899658203125 + "x": 1318.7869873046875, + "y": -152.27099609375 }, { - "x": 1232.218994140625, - "y": -135.375 + "x": 1320.373046875, + "y": -150.60000610351562 }, { - "x": 1231.5989990234375, - "y": -136.1060028076172 + "x": 1321.9410400390625, + "y": -148.91200256347656 }, { - "x": 1234.364990234375, - "y": -133 + "x": 1323.490966796875, + "y": -147.20799255371094 + }, + { + "x": 1325.0240478515625, + "y": -145.48800659179688 + }, + { + "x": 1324.47802734375, + "y": -146.16000366210938 + }, + { + "x": 1327.1810302734375, + "y": -143 } ], "isCurve": true, @@ -3636,272 +3696,288 @@ "link": "", "route": [ { - "x": 1273.43994140625, - "y": -67 + "x": 1366.0830078125, + "y": -77 }, { - "x": 1273.875, - "y": -65.77300262451172 + "x": 1366.2020263671875, + "y": -76.68499755859375 }, { - "x": 1274.552978515625, - "y": -63.79100036621094 + "x": 1366.9930419921875, + "y": -74.52200317382812 }, { - "x": 1275.2110595703125, - "y": -61.803001403808594 + "x": 1367.761962890625, + "y": -72.3499984741211 }, { - "x": 1275.8480224609375, - "y": -59.80799865722656 + "x": 1368.509033203125, + "y": -70.1709976196289 }, { - "x": 1276.4630126953125, - "y": -57.805999755859375 + "x": 1369.2320556640625, + "y": -67.98300170898438 }, { - "x": 1277.0579833984375, - "y": -55.79800033569336 + "x": 1369.9320068359375, + "y": -65.78800201416016 }, { - "x": 1277.6319580078125, - "y": -53.78300094604492 + "x": 1370.6099853515625, + "y": -63.58599853515625 }, { - "x": 1278.18505859375, - "y": -51.76300048828125 + "x": 1371.2640380859375, + "y": -61.37799835205078 }, { - "x": 1278.7159423828125, - "y": -49.73699951171875 + "x": 1371.89501953125, + "y": -59.1619987487793 }, { - "x": 1279.2259521484375, - "y": -47.70600128173828 + "x": 1372.5030517578125, + "y": -56.939998626708984 }, { - "x": 1279.7149658203125, - "y": -45.66999816894531 + "x": 1373.0880126953125, + "y": -54.71099853515625 }, { - "x": 1280.1829833984375, - "y": -43.62799835205078 + "x": 1373.6490478515625, + "y": -52.47700119018555 }, { - "x": 1280.6290283203125, - "y": -41.582000732421875 + "x": 1374.18701171875, + "y": -50.23699951171875 }, { - "x": 1281.053955078125, - "y": -39.53099822998047 + "x": 1374.7010498046875, + "y": -47.99100112915039 }, { - "x": 1281.45703125, - "y": -37.47600173950195 + "x": 1375.1920166015625, + "y": -45.7400016784668 }, { - "x": 1281.8389892578125, - "y": -35.41600036621094 + "x": 1375.6590576171875, + "y": -43.48400115966797 }, { - "x": 1282.198974609375, - "y": -33.35300064086914 + "x": 1376.10302734375, + "y": -41.222999572753906 }, { - "x": 1282.5369873046875, - "y": -31.285999298095703 + "x": 1376.52294921875, + "y": -38.95800018310547 }, { - "x": 1282.85400390625, - "y": -29.215999603271484 + "x": 1376.9189453125, + "y": -36.68899917602539 }, { - "x": 1283.1490478515625, - "y": -27.14299964904785 + "x": 1377.291015625, + "y": -34.415000915527344 }, { - "x": 1283.4219970703125, - "y": -25.06599998474121 + "x": 1377.6390380859375, + "y": -32.13800048828125 }, { - "x": 1283.6739501953125, - "y": -22.98699951171875 + "x": 1377.9639892578125, + "y": -29.85700035095215 }, { - "x": 1283.904052734375, - "y": -20.905000686645508 + "x": 1378.2650146484375, + "y": -27.572999954223633 }, { - "x": 1284.112060546875, - "y": -18.820999145507812 + "x": 1378.5419921875, + "y": -25.285999298095703 }, { - "x": 1284.2979736328125, - "y": -16.735000610351562 + "x": 1378.7939453125, + "y": -22.996000289916992 }, { - "x": 1284.4620361328125, - "y": -14.647000312805176 + "x": 1379.02294921875, + "y": -20.702999114990234 }, { - "x": 1284.60498046875, - "y": -12.557999610900879 + "x": 1379.22802734375, + "y": -18.409000396728516 }, { - "x": 1284.7249755859375, - "y": -10.467000007629395 + "x": 1379.4090576171875, + "y": -16.11199951171875 }, { - "x": 1284.823974609375, - "y": -8.375 + "x": 1379.56494140625, + "y": -13.812999725341797 }, { - "x": 1284.9010009765625, - "y": -6.2820000648498535 + "x": 1379.697998046875, + "y": -11.512999534606934 }, { - "x": 1284.9560546875, - "y": -4.188000202178955 + "x": 1379.8070068359375, + "y": -9.211999893188477 }, { - "x": 1284.989013671875, - "y": -2.0940001010894775 + "x": 1379.8909912109375, + "y": -6.909999847412109 }, { - "x": 1285, + "x": 1379.9510498046875, + "y": -4.60699987411499 + }, + { + "x": 1379.987060546875, + "y": -2.302999973297119 + }, + { + "x": 1380, "y": 0 }, { - "x": 1284.989013671875, - "y": 2.0940001010894775 + "x": 1379.987060546875, + "y": 2.302999973297119 }, { - "x": 1284.9560546875, - "y": 4.188000202178955 + "x": 1379.9510498046875, + "y": 4.60699987411499 }, { - "x": 1284.9010009765625, - "y": 6.2820000648498535 + "x": 1379.8909912109375, + "y": 6.909999847412109 }, { - "x": 1284.823974609375, - "y": 8.375 + "x": 1379.8070068359375, + "y": 9.211999893188477 }, { - "x": 1284.7249755859375, - "y": 10.467000007629395 + "x": 1379.697998046875, + "y": 11.512999534606934 }, { - "x": 1284.60498046875, - "y": 12.557999610900879 + "x": 1379.56494140625, + "y": 13.812999725341797 }, { - "x": 1284.4620361328125, - "y": 14.647000312805176 + "x": 1379.4090576171875, + "y": 16.11199951171875 }, { - "x": 1284.2979736328125, - "y": 16.735000610351562 + "x": 1379.22802734375, + "y": 18.409000396728516 }, { - "x": 1284.112060546875, - "y": 18.820999145507812 + "x": 1379.02294921875, + "y": 20.702999114990234 }, { - "x": 1283.904052734375, - "y": 20.905000686645508 + "x": 1378.7939453125, + "y": 22.996000289916992 }, { - "x": 1283.6739501953125, - "y": 22.98699951171875 + "x": 1378.5419921875, + "y": 25.285999298095703 }, { - "x": 1283.4219970703125, - "y": 25.06599998474121 + "x": 1378.2650146484375, + "y": 27.572999954223633 }, { - "x": 1283.1490478515625, - "y": 27.14299964904785 + "x": 1377.9639892578125, + "y": 29.85700035095215 }, { - "x": 1282.85400390625, - "y": 29.215999603271484 + "x": 1377.6390380859375, + "y": 32.13800048828125 }, { - "x": 1282.5369873046875, - "y": 31.285999298095703 + "x": 1377.291015625, + "y": 34.415000915527344 }, { - "x": 1282.198974609375, - "y": 33.35300064086914 + "x": 1376.9189453125, + "y": 36.68899917602539 }, { - "x": 1281.8389892578125, - "y": 35.41600036621094 + "x": 1376.52294921875, + "y": 38.95800018310547 }, { - "x": 1281.45703125, - "y": 37.47600173950195 + "x": 1376.10302734375, + "y": 41.222999572753906 }, { - "x": 1281.053955078125, - "y": 39.53099822998047 + "x": 1375.6590576171875, + "y": 43.48400115966797 }, { - "x": 1280.6290283203125, - "y": 41.582000732421875 + "x": 1375.1920166015625, + "y": 45.7400016784668 }, { - "x": 1280.1829833984375, - "y": 43.62799835205078 + "x": 1374.7010498046875, + "y": 47.99100112915039 }, { - "x": 1279.7149658203125, - "y": 45.66999816894531 + "x": 1374.18701171875, + "y": 50.23699951171875 }, { - "x": 1279.2259521484375, - "y": 47.70600128173828 + "x": 1373.6490478515625, + "y": 52.47700119018555 }, { - "x": 1278.7159423828125, - "y": 49.73699951171875 + "x": 1373.0880126953125, + "y": 54.71099853515625 }, { - "x": 1278.18505859375, - "y": 51.76300048828125 + "x": 1372.5030517578125, + "y": 56.939998626708984 }, { - "x": 1277.6319580078125, - "y": 53.78300094604492 + "x": 1371.89501953125, + "y": 59.1619987487793 }, { - "x": 1277.0579833984375, - "y": 55.79800033569336 + "x": 1371.2640380859375, + "y": 61.37799835205078 }, { - "x": 1276.4630126953125, - "y": 57.805999755859375 + "x": 1370.6099853515625, + "y": 63.58599853515625 }, { - "x": 1275.8480224609375, - "y": 59.80799865722656 + "x": 1369.9320068359375, + "y": 65.78800201416016 }, { - "x": 1275.2110595703125, - "y": 61.803001403808594 + "x": 1369.2320556640625, + "y": 67.98300170898438 }, { - "x": 1274.552978515625, - "y": 63.79100036621094 + "x": 1368.509033203125, + "y": 70.1709976196289 }, { - "x": 1274.833984375, - "y": 63.08100128173828 + "x": 1367.761962890625, + "y": 72.3499984741211 }, { - "x": 1273.43994140625, - "y": 66.9990005493164 + "x": 1366.9930419921875, + "y": 74.52200317382812 + }, + { + "x": 1367.5379638671875, + "y": 73.10399627685547 + }, + { + "x": 1366.0830078125, + "y": 76.9990005493164 } ], "isCurve": true, @@ -3936,284 +4012,296 @@ "link": "", "route": [ { - "x": 1234.364990234375, - "y": 132.99899291992188 + "x": 1327.1810302734375, + "y": 142.99899291992188 }, { - "x": 1233.6280517578125, - "y": 133.8260040283203 + "x": 1326.5379638671875, + "y": 143.7519989013672 }, { - "x": 1232.218994140625, - "y": 135.375 + "x": 1325.0240478515625, + "y": 145.48800659179688 }, { - "x": 1230.79296875, - "y": 136.90899658203125 + "x": 1323.490966796875, + "y": 147.20799255371094 }, { - "x": 1229.35205078125, - "y": 138.42799377441406 + "x": 1321.9410400390625, + "y": 148.91200256347656 }, { - "x": 1227.89404296875, - "y": 139.9320068359375 + "x": 1320.373046875, + "y": 150.60000610351562 }, { - "x": 1226.4210205078125, - "y": 141.42100524902344 + "x": 1318.7869873046875, + "y": 152.27099609375 }, { - "x": 1224.9320068359375, - "y": 142.8939971923828 + "x": 1317.1829833984375, + "y": 153.9250030517578 }, { - "x": 1223.427978515625, - "y": 144.3520050048828 + "x": 1315.56298828125, + "y": 155.56300354003906 }, { - "x": 1221.9090576171875, - "y": 145.79299926757812 + "x": 1313.925048828125, + "y": 157.18299865722656 }, { - "x": 1220.375, - "y": 147.218994140625 + "x": 1312.27099609375, + "y": 158.78700256347656 }, { - "x": 1218.8260498046875, - "y": 148.6280059814453 + "x": 1310.5999755859375, + "y": 160.3730010986328 }, { - "x": 1217.261962890625, - "y": 150.02200317382812 + "x": 1308.9119873046875, + "y": 161.9409942626953 }, { - "x": 1215.6839599609375, - "y": 151.3990020751953 + "x": 1307.2080078125, + "y": 163.49099731445312 }, { - "x": 1214.0909423828125, - "y": 152.75900268554688 + "x": 1305.488037109375, + "y": 165.0240020751953 }, { - "x": 1212.4840087890625, - "y": 154.1020050048828 + "x": 1303.751953125, + "y": 166.53799438476562 }, { - "x": 1210.864013671875, - "y": 155.4290008544922 + "x": 1302, + "y": 168.03500366210938 }, { - "x": 1209.22900390625, - "y": 156.73800659179688 + "x": 1300.2330322265625, + "y": 169.51199340820312 }, { - "x": 1207.5810546875, - "y": 158.031005859375 + "x": 1298.449951171875, + "y": 170.9720001220703 }, { - "x": 1205.9189453125, - "y": 159.30499267578125 + "x": 1296.6519775390625, + "y": 172.41200256347656 }, { - "x": 1204.2440185546875, - "y": 160.56300354003906 + "x": 1294.8389892578125, + "y": 173.83399963378906 }, { - "x": 1202.5570068359375, - "y": 161.80299377441406 + "x": 1293.010986328125, + "y": 175.23599243164062 }, { - "x": 1200.85595703125, - "y": 163.02499389648438 + "x": 1291.1689453125, + "y": 176.61900329589844 }, { - "x": 1199.1419677734375, - "y": 164.22900390625 + "x": 1289.31201171875, + "y": 177.98300170898438 }, { - "x": 1197.416015625, - "y": 165.41600036621094 + "x": 1287.4410400390625, + "y": 179.3280029296875 }, { - "x": 1195.677978515625, - "y": 166.58399963378906 + "x": 1285.5560302734375, + "y": 180.65199279785156 }, { - "x": 1193.927001953125, - "y": 167.73399353027344 + "x": 1283.657958984375, + "y": 181.95700073242188 }, { - "x": 1192.1650390625, - "y": 168.86500549316406 + "x": 1281.7459716796875, + "y": 183.24200439453125 }, { - "x": 1190.3909912109375, - "y": 169.97799682617188 + "x": 1279.8199462890625, + "y": 184.5070037841797 }, { - "x": 1188.60498046875, - "y": 171.07200622558594 + "x": 1277.8809814453125, + "y": 185.7519989013672 }, { - "x": 1186.8079833984375, - "y": 172.1479949951172 + "x": 1275.9300537109375, + "y": 186.9759979248047 }, { - "x": 1185, - "y": 173.2050018310547 + "x": 1273.9649658203125, + "y": 188.17999267578125 }, { - "x": 1183.1800537109375, - "y": 174.24200439453125 + "x": 1271.989013671875, + "y": 189.36300659179688 }, { - "x": 1181.3499755859375, - "y": 175.26100158691406 + "x": 1270, + "y": 190.52499389648438 }, { - "x": 1179.510009765625, - "y": 176.25999450683594 + "x": 1267.998046875, + "y": 191.66700744628906 }, { - "x": 1177.6590576171875, - "y": 177.24000549316406 + "x": 1265.9849853515625, + "y": 192.78700256347656 }, { - "x": 1175.7979736328125, - "y": 178.2010040283203 + "x": 1263.9610595703125, + "y": 193.88600158691406 }, { - "x": 1173.927001953125, - "y": 179.14199829101562 + "x": 1261.925048828125, + "y": 194.96400451660156 }, { - "x": 1172.0460205078125, - "y": 180.06300354003906 + "x": 1259.876953125, + "y": 196.02099609375 }, { - "x": 1170.155029296875, - "y": 180.96499633789062 + "x": 1257.8189697265625, + "y": 197.05599975585938 }, { - "x": 1168.2559814453125, - "y": 181.8470001220703 + "x": 1255.75, + "y": 198.07000732421875 }, { - "x": 1166.3470458984375, - "y": 182.70899963378906 + "x": 1253.6710205078125, + "y": 199.06100463867188 }, { - "x": 1164.428955078125, - "y": 183.5500030517578 + "x": 1251.5810546875, + "y": 200.031005859375 }, { - "x": 1162.5030517578125, - "y": 184.3719940185547 + "x": 1249.4820556640625, + "y": 200.97999572753906 }, { - "x": 1160.5679931640625, - "y": 185.1739959716797 + "x": 1247.3719482421875, + "y": 201.906005859375 }, { - "x": 1158.6240234375, - "y": 185.9550018310547 + "x": 1245.2530517578125, + "y": 202.8090057373047 }, { - "x": 1156.6729736328125, - "y": 186.71600341796875 + "x": 1243.1240234375, + "y": 203.6909942626953 }, { - "x": 1154.7139892578125, - "y": 187.45599365234375 + "x": 1240.987060546875, + "y": 204.5500030517578 }, { - "x": 1152.7469482421875, - "y": 188.17599487304688 + "x": 1238.8399658203125, + "y": 205.38699340820312 }, { - "x": 1150.77294921875, - "y": 188.875 + "x": 1236.68505859375, + "y": 206.20199584960938 }, { - "x": 1148.791015625, - "y": 189.55299377441406 + "x": 1234.52197265625, + "y": 206.9929962158203 }, { - "x": 1146.802978515625, - "y": 190.21099853515625 + "x": 1232.3499755859375, + "y": 207.76199340820312 }, { - "x": 1144.8079833984375, - "y": 190.84800720214844 + "x": 1230.1710205078125, + "y": 208.50900268554688 }, { - "x": 1142.8060302734375, - "y": 191.46299743652344 + "x": 1227.9830322265625, + "y": 209.23199462890625 }, { - "x": 1140.7979736328125, - "y": 192.05799865722656 + "x": 1225.7879638671875, + "y": 209.9320068359375 }, { - "x": 1138.782958984375, - "y": 192.6320037841797 + "x": 1223.5860595703125, + "y": 210.61000061035156 }, { - "x": 1136.762939453125, - "y": 193.18499755859375 + "x": 1221.3780517578125, + "y": 211.26400756835938 }, { - "x": 1134.737060546875, - "y": 193.71600341796875 + "x": 1219.1619873046875, + "y": 211.89500427246094 }, { - "x": 1132.7060546875, - "y": 194.2259979248047 + "x": 1216.93994140625, + "y": 212.5030059814453 }, { - "x": 1130.6700439453125, - "y": 194.71499633789062 + "x": 1214.7110595703125, + "y": 213.08799743652344 }, { - "x": 1128.6280517578125, - "y": 195.18299865722656 + "x": 1212.47705078125, + "y": 213.6490020751953 }, { - "x": 1126.58203125, - "y": 195.62899780273438 + "x": 1210.237060546875, + "y": 214.18699645996094 }, { - "x": 1124.531005859375, - "y": 196.0540008544922 + "x": 1207.990966796875, + "y": 214.7010040283203 }, { - "x": 1122.4759521484375, - "y": 196.45700073242188 + "x": 1205.739990234375, + "y": 215.19200134277344 }, { - "x": 1120.416015625, - "y": 196.83900451660156 + "x": 1203.4840087890625, + "y": 215.65899658203125 }, { - "x": 1118.35302734375, - "y": 197.19900512695312 + "x": 1201.2230224609375, + "y": 216.10299682617188 }, { - "x": 1116.2860107421875, - "y": 197.53700256347656 + "x": 1198.9580078125, + "y": 216.5229949951172 }, { - "x": 1114.2159423828125, - "y": 197.85400390625 + "x": 1196.68896484375, + "y": 216.91900634765625 }, { - "x": 1116.1199951171875, - "y": 197.6060028076172 + "x": 1194.4150390625, + "y": 217.29100036621094 }, { - "x": 1112, - "y": 198.16799926757812 + "x": 1192.137939453125, + "y": 217.63900756835938 + }, + { + "x": 1189.8570556640625, + "y": 217.96400451660156 + }, + { + "x": 1191.126953125, + "y": 217.82400512695312 + }, + { + "x": 1187, + "y": 218.33399963378906 } ], "isCurve": true, @@ -4248,284 +4336,296 @@ "link": "", "route": [ { - "x": 1058, - "y": 198.16799926757812 + "x": 1133, + "y": 218.33399963378906 }, { - "x": 1057.85595703125, - "y": 198.1490020751953 + "x": 1132.426025390625, + "y": 218.26499938964844 }, { - "x": 1055.782958984375, - "y": 197.85400390625 + "x": 1130.1419677734375, + "y": 217.96400451660156 }, { - "x": 1053.7130126953125, - "y": 197.53700256347656 + "x": 1127.8609619140625, + "y": 217.63900756835938 }, { - "x": 1051.64599609375, - "y": 197.19900512695312 + "x": 1125.583984375, + "y": 217.29100036621094 }, { - "x": 1049.5830078125, - "y": 196.83900451660156 + "x": 1123.31005859375, + "y": 216.91900634765625 }, { - "x": 1047.52294921875, - "y": 196.45700073242188 + "x": 1121.041015625, + "y": 216.5229949951172 }, { - "x": 1045.468017578125, - "y": 196.0540008544922 + "x": 1118.7760009765625, + "y": 216.10299682617188 }, { - "x": 1043.4169921875, - "y": 195.62899780273438 + "x": 1116.5150146484375, + "y": 215.65899658203125 }, { - "x": 1041.3709716796875, - "y": 195.18299865722656 + "x": 1114.259033203125, + "y": 215.19200134277344 }, { - "x": 1039.3289794921875, - "y": 194.71499633789062 + "x": 1112.008056640625, + "y": 214.7010040283203 }, { - "x": 1037.29296875, - "y": 194.2259979248047 + "x": 1109.761962890625, + "y": 214.18699645996094 }, { - "x": 1035.261962890625, - "y": 193.71600341796875 + "x": 1107.52197265625, + "y": 213.6490020751953 }, { - "x": 1033.2359619140625, - "y": 193.18499755859375 + "x": 1105.2879638671875, + "y": 213.08799743652344 }, { - "x": 1031.2159423828125, - "y": 192.6320037841797 + "x": 1103.0589599609375, + "y": 212.5030059814453 }, { - "x": 1029.2010498046875, - "y": 192.05799865722656 + "x": 1100.8370361328125, + "y": 211.89500427246094 }, { - "x": 1027.1929931640625, - "y": 191.46299743652344 + "x": 1098.6209716796875, + "y": 211.26400756835938 }, { - "x": 1025.1910400390625, - "y": 190.84800720214844 + "x": 1096.4129638671875, + "y": 210.61000061035156 }, { - "x": 1023.1959838867188, - "y": 190.21099853515625 + "x": 1094.2110595703125, + "y": 209.9320068359375 }, { - "x": 1021.2080078125, - "y": 189.55299377441406 + "x": 1092.0159912109375, + "y": 209.23199462890625 }, { - "x": 1019.2260131835938, - "y": 188.875 + "x": 1089.8280029296875, + "y": 208.50900268554688 }, { - "x": 1017.2520141601562, - "y": 188.17599487304688 + "x": 1087.6490478515625, + "y": 207.76199340820312 }, { - "x": 1015.2849731445312, - "y": 187.45599365234375 + "x": 1085.47705078125, + "y": 206.9929962158203 }, { - "x": 1013.3259887695312, - "y": 186.71600341796875 + "x": 1083.31396484375, + "y": 206.20199584960938 }, { - "x": 1011.375, - "y": 185.9550018310547 + "x": 1081.1590576171875, + "y": 205.38699340820312 }, { - "x": 1009.4310302734375, - "y": 185.1739959716797 + "x": 1079.011962890625, + "y": 204.5500030517578 }, { - "x": 1007.4959716796875, - "y": 184.3719940185547 + "x": 1076.875, + "y": 203.6909942626953 }, { - "x": 1005.5700073242188, - "y": 183.5500030517578 + "x": 1074.7459716796875, + "y": 202.8090057373047 }, { - "x": 1003.6519775390625, - "y": 182.70899963378906 + "x": 1072.626953125, + "y": 201.906005859375 }, { - "x": 1001.7429809570312, - "y": 181.8470001220703 + "x": 1070.5169677734375, + "y": 200.97999572753906 }, { - "x": 999.843994140625, - "y": 180.96499633789062 + "x": 1068.41796875, + "y": 200.031005859375 }, { - "x": 997.9530029296875, - "y": 180.06300354003906 + "x": 1066.3280029296875, + "y": 199.06100463867188 }, { - "x": 996.072021484375, - "y": 179.14199829101562 + "x": 1064.2490234375, + "y": 198.07000732421875 }, { - "x": 994.2009887695312, - "y": 178.2010040283203 + "x": 1062.1800537109375, + "y": 197.05599975585938 }, { - "x": 992.3400268554688, - "y": 177.24000549316406 + "x": 1060.1219482421875, + "y": 196.02099609375 }, { - "x": 990.489013671875, - "y": 176.25999450683594 + "x": 1058.073974609375, + "y": 194.96400451660156 }, { - "x": 988.6489868164062, - "y": 175.26100158691406 + "x": 1056.0379638671875, + "y": 193.88600158691406 }, { - "x": 986.8189697265625, - "y": 174.24200439453125 + "x": 1054.0140380859375, + "y": 192.78700256347656 }, { - "x": 985, - "y": 173.2050018310547 + "x": 1052.0009765625, + "y": 191.66700744628906 }, { - "x": 983.1909790039062, - "y": 172.1479949951172 + "x": 1050, + "y": 190.52499389648438 }, { - "x": 981.3939819335938, - "y": 171.07200622558594 + "x": 1048.010009765625, + "y": 189.36300659179688 }, { - "x": 979.6079711914062, - "y": 169.97799682617188 + "x": 1046.0340576171875, + "y": 188.17999267578125 }, { - "x": 977.833984375, - "y": 168.86500549316406 + "x": 1044.0689697265625, + "y": 186.9759979248047 }, { - "x": 976.072021484375, - "y": 167.73399353027344 + "x": 1042.1180419921875, + "y": 185.7519989013672 }, { - "x": 974.3209838867188, - "y": 166.58399963378906 + "x": 1040.178955078125, + "y": 184.5070037841797 }, { - "x": 972.5830078125, - "y": 165.41600036621094 + "x": 1038.2530517578125, + "y": 183.24200439453125 }, { - "x": 970.8569946289062, - "y": 164.22900390625 + "x": 1036.3409423828125, + "y": 181.95700073242188 }, { - "x": 969.1430053710938, - "y": 163.02499389648438 + "x": 1034.4429931640625, + "y": 180.65199279785156 }, { - "x": 967.4420166015625, - "y": 161.80299377441406 + "x": 1032.5579833984375, + "y": 179.3280029296875 }, { - "x": 965.7550048828125, - "y": 160.56300354003906 + "x": 1030.68701171875, + "y": 177.98300170898438 }, { - "x": 964.0800170898438, - "y": 159.30499267578125 + "x": 1028.8299560546875, + "y": 176.61900329589844 }, { - "x": 962.4180297851562, - "y": 158.031005859375 + "x": 1026.988037109375, + "y": 175.23599243164062 }, { - "x": 960.77001953125, - "y": 156.73800659179688 + "x": 1025.1600341796875, + "y": 173.83399963378906 }, { - "x": 959.135009765625, - "y": 155.4290008544922 + "x": 1023.3469848632812, + "y": 172.41200256347656 }, { - "x": 957.5150146484375, - "y": 154.1020050048828 + "x": 1021.5490112304688, + "y": 170.9720001220703 }, { - "x": 955.9080200195312, - "y": 152.75900268554688 + "x": 1019.7659912109375, + "y": 169.51199340820312 }, { - "x": 954.3150024414062, - "y": 151.3990020751953 + "x": 1017.9990234375, + "y": 168.03500366210938 }, { - "x": 952.7369995117188, - "y": 150.02200317382812 + "x": 1016.2470092773438, + "y": 166.53799438476562 }, { - "x": 951.1729736328125, - "y": 148.6280059814453 + "x": 1014.510986328125, + "y": 165.0240020751953 }, { - "x": 949.6240234375, - "y": 147.218994140625 + "x": 1012.791015625, + "y": 163.49099731445312 }, { - "x": 948.0900268554688, - "y": 145.79299926757812 + "x": 1011.0869750976562, + "y": 161.9409942626953 }, { - "x": 946.5709838867188, - "y": 144.3520050048828 + "x": 1009.3989868164062, + "y": 160.3730010986328 }, { - "x": 945.0670166015625, - "y": 142.8939971923828 + "x": 1007.72802734375, + "y": 158.78700256347656 }, { - "x": 943.5780029296875, - "y": 141.42100524902344 + "x": 1006.073974609375, + "y": 157.18299865722656 }, { - "x": 942.10498046875, - "y": 139.9320068359375 + "x": 1004.4359741210938, + "y": 155.56300354003906 }, { - "x": 940.64697265625, - "y": 138.42799377441406 + "x": 1002.8159790039062, + "y": 153.9250030517578 }, { - "x": 939.2059936523438, - "y": 136.90899658203125 + "x": 1001.2119750976562, + "y": 152.27099609375 }, { - "x": 937.780029296875, - "y": 135.375 + "x": 999.6259765625, + "y": 150.60000610351562 }, { - "x": 938.4000244140625, - "y": 136.1060028076172 + "x": 998.0579833984375, + "y": 148.91200256347656 }, { - "x": 935.6339721679688, - "y": 133 + "x": 996.5079956054688, + "y": 147.20799255371094 + }, + { + "x": 994.9749755859375, + "y": 145.48800659179688 + }, + { + "x": 995.52099609375, + "y": 146.16000366210938 + }, + { + "x": 992.8179931640625, + "y": 143 } ], "isCurve": true, @@ -4560,272 +4660,288 @@ "link": "", "route": [ { - "x": 896.5590209960938, - "y": 67 + "x": 953.916015625, + "y": 77 }, { - "x": 896.1240234375, - "y": 65.77300262451172 + "x": 953.7969970703125, + "y": 76.68499755859375 }, { - "x": 895.4459838867188, - "y": 63.79100036621094 + "x": 953.0059814453125, + "y": 74.52200317382812 }, { - "x": 894.7880249023438, - "y": 61.803001403808594 + "x": 952.2369995117188, + "y": 72.3499984741211 }, { - "x": 894.1510009765625, - "y": 59.80799865722656 + "x": 951.489990234375, + "y": 70.1709976196289 }, { - "x": 893.5360107421875, - "y": 57.805999755859375 + "x": 950.7670288085938, + "y": 67.98300170898438 }, { - "x": 892.9409790039062, - "y": 55.79800033569336 + "x": 950.0670166015625, + "y": 65.78800201416016 }, { - "x": 892.3670043945312, - "y": 53.78300094604492 + "x": 949.3889770507812, + "y": 63.58599853515625 }, { - "x": 891.8140258789062, - "y": 51.76300048828125 + "x": 948.7349853515625, + "y": 61.37799835205078 }, { - "x": 891.2830200195312, - "y": 49.73699951171875 + "x": 948.10400390625, + "y": 59.1619987487793 }, { - "x": 890.7730102539062, - "y": 47.70600128173828 + "x": 947.4959716796875, + "y": 56.939998626708984 }, { - "x": 890.2839965820312, - "y": 45.66999816894531 + "x": 946.9110107421875, + "y": 54.71099853515625 }, { - "x": 889.8159790039062, - "y": 43.62799835205078 + "x": 946.3499755859375, + "y": 52.47700119018555 }, { - "x": 889.3699951171875, - "y": 41.582000732421875 + "x": 945.81201171875, + "y": 50.23699951171875 }, { - "x": 888.9450073242188, - "y": 39.53099822998047 + "x": 945.2979736328125, + "y": 47.99100112915039 }, { - "x": 888.5419921875, - "y": 37.47600173950195 + "x": 944.8070068359375, + "y": 45.7400016784668 }, { - "x": 888.1599731445312, - "y": 35.41600036621094 + "x": 944.3400268554688, + "y": 43.48400115966797 }, { - "x": 887.7999877929688, - "y": 33.35300064086914 + "x": 943.89599609375, + "y": 41.222999572753906 }, { - "x": 887.4619750976562, - "y": 31.285999298095703 + "x": 943.4760131835938, + "y": 38.95800018310547 }, { - "x": 887.14501953125, - "y": 29.215999603271484 + "x": 943.0800170898438, + "y": 36.68899917602539 }, { - "x": 886.8499755859375, - "y": 27.14299964904785 + "x": 942.7080078125, + "y": 34.415000915527344 }, { - "x": 886.5770263671875, - "y": 25.06599998474121 + "x": 942.3599853515625, + "y": 32.13800048828125 }, { - "x": 886.3250122070312, - "y": 22.98699951171875 + "x": 942.0349731445312, + "y": 29.85700035095215 }, { - "x": 886.094970703125, - "y": 20.905000686645508 + "x": 941.7340087890625, + "y": 27.572999954223633 }, { - "x": 885.8870239257812, - "y": 18.820999145507812 + "x": 941.4569702148438, + "y": 25.285999298095703 }, { - "x": 885.7009887695312, - "y": 16.735000610351562 + "x": 941.2050170898438, + "y": 22.996000289916992 }, { - "x": 885.5369873046875, - "y": 14.647000312805176 + "x": 940.9760131835938, + "y": 20.702999114990234 }, { - "x": 885.3939819335938, - "y": 12.557999610900879 + "x": 940.77099609375, + "y": 18.409000396728516 }, { - "x": 885.2739868164062, - "y": 10.467000007629395 + "x": 940.5900268554688, + "y": 16.11199951171875 }, { - "x": 885.1749877929688, - "y": 8.375 + "x": 940.4340209960938, + "y": 13.812999725341797 }, { - "x": 885.0980224609375, - "y": 6.2820000648498535 + "x": 940.301025390625, + "y": 11.512999534606934 }, { - "x": 885.0430297851562, - "y": 4.188000202178955 + "x": 940.1920166015625, + "y": 9.211999893188477 }, { - "x": 885.010009765625, - "y": 2.0940001010894775 + "x": 940.1079711914062, + "y": 6.909999847412109 }, { - "x": 885, + "x": 940.0479736328125, + "y": 4.60699987411499 + }, + { + "x": 940.0120239257812, + "y": 2.302999973297119 + }, + { + "x": 940, "y": 0 }, { - "x": 885.010009765625, - "y": -2.0940001010894775 + "x": 940.0120239257812, + "y": -2.302999973297119 }, { - "x": 885.0430297851562, - "y": -4.188000202178955 + "x": 940.0479736328125, + "y": -4.60699987411499 }, { - "x": 885.0980224609375, - "y": -6.2820000648498535 + "x": 940.1079711914062, + "y": -6.909999847412109 }, { - "x": 885.1749877929688, - "y": -8.375 + "x": 940.1920166015625, + "y": -9.211999893188477 }, { - "x": 885.2739868164062, - "y": -10.467000007629395 + "x": 940.301025390625, + "y": -11.512999534606934 }, { - "x": 885.3939819335938, - "y": -12.557999610900879 + "x": 940.4340209960938, + "y": -13.812999725341797 }, { - "x": 885.5369873046875, - "y": -14.647000312805176 + "x": 940.5900268554688, + "y": -16.11199951171875 }, { - "x": 885.7009887695312, - "y": -16.735000610351562 + "x": 940.77099609375, + "y": -18.409000396728516 }, { - "x": 885.8870239257812, - "y": -18.820999145507812 + "x": 940.9760131835938, + "y": -20.702999114990234 }, { - "x": 886.094970703125, - "y": -20.905000686645508 + "x": 941.2050170898438, + "y": -22.996000289916992 }, { - "x": 886.3250122070312, - "y": -22.98699951171875 + "x": 941.4569702148438, + "y": -25.285999298095703 }, { - "x": 886.5770263671875, - "y": -25.06599998474121 + "x": 941.7340087890625, + "y": -27.572999954223633 }, { - "x": 886.8499755859375, - "y": -27.14299964904785 + "x": 942.0349731445312, + "y": -29.85700035095215 }, { - "x": 887.14501953125, - "y": -29.215999603271484 + "x": 942.3599853515625, + "y": -32.13800048828125 }, { - "x": 887.4619750976562, - "y": -31.285999298095703 + "x": 942.7080078125, + "y": -34.415000915527344 }, { - "x": 887.7999877929688, - "y": -33.35300064086914 + "x": 943.0800170898438, + "y": -36.68899917602539 }, { - "x": 888.1599731445312, - "y": -35.41600036621094 + "x": 943.4760131835938, + "y": -38.95800018310547 }, { - "x": 888.5419921875, - "y": -37.47600173950195 + "x": 943.89599609375, + "y": -41.222999572753906 }, { - "x": 888.9450073242188, - "y": -39.53099822998047 + "x": 944.3400268554688, + "y": -43.48400115966797 }, { - "x": 889.3699951171875, - "y": -41.582000732421875 + "x": 944.8070068359375, + "y": -45.7400016784668 }, { - "x": 889.8159790039062, - "y": -43.62799835205078 + "x": 945.2979736328125, + "y": -47.99100112915039 }, { - "x": 890.2839965820312, - "y": -45.66999816894531 + "x": 945.81201171875, + "y": -50.23699951171875 }, { - "x": 890.7730102539062, - "y": -47.70600128173828 + "x": 946.3499755859375, + "y": -52.47700119018555 }, { - "x": 891.2830200195312, - "y": -49.73699951171875 + "x": 946.9110107421875, + "y": -54.71099853515625 }, { - "x": 891.8140258789062, - "y": -51.76300048828125 + "x": 947.4959716796875, + "y": -56.939998626708984 }, { - "x": 892.3670043945312, - "y": -53.78300094604492 + "x": 948.10400390625, + "y": -59.1619987487793 }, { - "x": 892.9409790039062, - "y": -55.79800033569336 + "x": 948.7349853515625, + "y": -61.37799835205078 }, { - "x": 893.5360107421875, - "y": -57.805999755859375 + "x": 949.3889770507812, + "y": -63.58599853515625 }, { - "x": 894.1510009765625, - "y": -59.80799865722656 + "x": 950.0670166015625, + "y": -65.78800201416016 }, { - "x": 894.7880249023438, - "y": -61.803001403808594 + "x": 950.7670288085938, + "y": -67.98300170898438 }, { - "x": 895.4459838867188, - "y": -63.79100036621094 + "x": 951.489990234375, + "y": -70.1709976196289 }, { - "x": 895.1649780273438, - "y": -63.08100128173828 + "x": 952.2369995117188, + "y": -72.3499984741211 }, { - "x": 896.5590209960938, - "y": -67 + "x": 953.0059814453125, + "y": -74.52200317382812 + }, + { + "x": 952.4609985351562, + "y": -73.10399627685547 + }, + { + "x": 953.916015625, + "y": -77 } ], "isCurve": true, @@ -4860,312 +4976,324 @@ "link": "", "route": [ { - "x": 1570.5, - "y": -178.23199462890625 + "x": 1680.5, + "y": -196.39300537109375 }, { - "x": 1571.5579833984375, - "y": -178.0919952392578 + "x": 1681.572998046875, + "y": -196.26499938964844 }, { - "x": 1574.0450439453125, - "y": -177.72999572753906 + "x": 1684.31298828125, + "y": -195.9010009765625 }, { - "x": 1576.5269775390625, - "y": -177.33700561523438 + "x": 1687.0489501953125, + "y": -195.5030059814453 }, { - "x": 1579.0040283203125, - "y": -176.91200256347656 + "x": 1689.780029296875, + "y": -195.07000732421875 }, { - "x": 1581.4759521484375, - "y": -176.45700073242188 + "x": 1692.5050048828125, + "y": -194.60400390625 }, { - "x": 1583.9410400390625, - "y": -175.9709930419922 + "x": 1695.2230224609375, + "y": -194.10299682617188 }, { - "x": 1586.4010009765625, - "y": -175.4530029296875 + "x": 1697.93603515625, + "y": -193.5679931640625 }, { - "x": 1588.85400390625, - "y": -174.90499877929688 + "x": 1700.6409912109375, + "y": -192.9980010986328 }, { - "x": 1591.2989501953125, - "y": -174.3260040283203 + "x": 1703.3389892578125, + "y": -192.39500427246094 }, { - "x": 1593.737060546875, - "y": -173.71600341796875 + "x": 1706.029052734375, + "y": -191.75799560546875 }, { - "x": 1596.16796875, - "y": -173.0760040283203 + "x": 1708.7110595703125, + "y": -191.08799743652344 }, { - "x": 1598.5899658203125, - "y": -172.40499877929688 + "x": 1711.385009765625, + "y": -190.38299560546875 }, { - "x": 1601.0030517578125, - "y": -171.70399475097656 + "x": 1714.0489501953125, + "y": -189.64599609375 }, { - "x": 1603.407958984375, - "y": -170.9720001220703 + "x": 1716.7039794921875, + "y": -188.87399291992188 }, { - "x": 1605.802978515625, - "y": -170.21099853515625 + "x": 1719.3489990234375, + "y": -188.07000732421875 }, { - "x": 1608.18798828125, - "y": -169.41900634765625 + "x": 1721.9830322265625, + "y": -187.23199462890625 }, { - "x": 1610.56298828125, - "y": -168.59800720214844 + "x": 1724.6070556640625, + "y": -186.36099243164062 }, { - "x": 1612.927978515625, - "y": -167.74600219726562 + "x": 1727.219970703125, + "y": -185.45700073242188 }, { - "x": 1615.281982421875, - "y": -166.86500549316406 + "x": 1729.821044921875, + "y": -184.52099609375 }, { - "x": 1617.6240234375, - "y": -165.9550018310547 + "x": 1732.4100341796875, + "y": -183.552001953125 }, { - "x": 1619.9549560546875, - "y": -165.01499938964844 + "x": 1734.987060546875, + "y": -182.5500030517578 }, { - "x": 1622.2740478515625, - "y": -164.04600524902344 + "x": 1737.551025390625, + "y": -181.51600646972656 }, { - "x": 1624.5810546875, - "y": -163.04800415039062 + "x": 1740.10205078125, + "y": -180.4510040283203 }, { - "x": 1626.875, - "y": -162.02099609375 + "x": 1742.6390380859375, + "y": -179.35299682617188 }, { - "x": 1629.155029296875, - "y": -160.96499633789062 + "x": 1745.1619873046875, + "y": -178.22300720214844 }, { - "x": 1631.4229736328125, - "y": -159.88099670410156 + "x": 1747.6710205078125, + "y": -177.06100463867188 }, { - "x": 1633.676025390625, - "y": -158.76800537109375 + "x": 1750.1650390625, + "y": -175.86900329589844 }, { - "x": 1635.9150390625, - "y": -157.6269989013672 + "x": 1752.64404296875, + "y": -174.64500427246094 }, { - "x": 1638.1400146484375, - "y": -156.45799255371094 + "x": 1755.1070556640625, + "y": -173.38999938964844 }, { - "x": 1640.3499755859375, - "y": -155.26100158691406 + "x": 1757.553955078125, + "y": -172.10400390625 }, { - "x": 1642.5450439453125, - "y": -154.03599548339844 + "x": 1759.9849853515625, + "y": -170.78700256347656 }, { - "x": 1644.7239990234375, - "y": -152.78399658203125 + "x": 1762.4000244140625, + "y": -169.44000244140625 }, { - "x": 1646.886962890625, - "y": -151.5050048828125 + "x": 1764.7969970703125, + "y": -168.06300354003906 }, { - "x": 1649.0340576171875, - "y": -150.197998046875 + "x": 1767.176025390625, + "y": -166.65499877929688 }, { - "x": 1651.1650390625, - "y": -148.86500549316406 + "x": 1769.5379638671875, + "y": -165.21800231933594 }, { - "x": 1653.2779541015625, - "y": -147.5050048828125 + "x": 1771.8809814453125, + "y": -163.7519989013672 }, { - "x": 1655.375, - "y": -146.11900329589844 + "x": 1774.2060546875, + "y": -162.25599670410156 }, { - "x": 1657.4530029296875, - "y": -144.70599365234375 + "x": 1776.511962890625, + "y": -160.7310028076172 }, { - "x": 1659.5140380859375, - "y": -143.26699829101562 + "x": 1778.7989501953125, + "y": -159.177001953125 }, { - "x": 1661.5570068359375, - "y": -141.80299377441406 + "x": 1781.06494140625, + "y": -157.593994140625 }, { - "x": 1663.5799560546875, - "y": -140.31300354003906 + "x": 1783.31201171875, + "y": -155.98300170898438 }, { - "x": 1665.5860595703125, - "y": -138.79800415039062 + "x": 1785.5389404296875, + "y": -154.343994140625 }, { - "x": 1667.571044921875, - "y": -137.2570037841797 + "x": 1787.7440185546875, + "y": -152.677001953125 }, { - "x": 1669.5379638671875, - "y": -135.69200134277344 + "x": 1789.928955078125, + "y": -150.98300170898438 }, { - "x": 1671.4840087890625, - "y": -134.1020050048828 + "x": 1792.092041015625, + "y": -149.26100158691406 }, { - "x": 1673.4110107421875, - "y": -132.48800659179688 + "x": 1794.2330322265625, + "y": -147.51199340820312 }, { - "x": 1675.3170166015625, - "y": -130.85000610351562 + "x": 1796.35205078125, + "y": -145.73699951171875 }, { - "x": 1677.2020263671875, - "y": -129.18800354003906 + "x": 1798.447998046875, + "y": -143.93499755859375 }, { - "x": 1679.0660400390625, - "y": -127.50199890136719 + "x": 1800.52197265625, + "y": -142.10699462890625 }, { - "x": 1680.9090576171875, - "y": -125.79299926757812 + "x": 1802.572998046875, + "y": -140.2519989013672 }, { - "x": 1682.72998046875, - "y": -124.06099700927734 + "x": 1804.5999755859375, + "y": -138.3730010986328 }, { - "x": 1684.529052734375, - "y": -122.30699920654297 + "x": 1806.60302734375, + "y": -136.4669952392578 }, { - "x": 1686.3070068359375, - "y": -120.52899932861328 + "x": 1808.58203125, + "y": -134.53700256347656 }, { - "x": 1688.06103515625, - "y": -118.7300033569336 + "x": 1810.5369873046875, + "y": -132.58200073242188 }, { - "x": 1689.79296875, - "y": -116.90899658203125 + "x": 1812.467041015625, + "y": -130.60299682617188 }, { - "x": 1691.501953125, - "y": -115.06600189208984 + "x": 1814.373046875, + "y": -128.60000610351562 }, { - "x": 1693.18798828125, - "y": -113.2020034790039 + "x": 1816.251953125, + "y": -126.572998046875 }, { - "x": 1694.8499755859375, - "y": -111.31700134277344 + "x": 1818.1070556640625, + "y": -124.52200317382812 }, { - "x": 1696.488037109375, - "y": -109.41100311279297 + "x": 1819.93505859375, + "y": -122.447998046875 }, { - "x": 1698.10205078125, - "y": -107.48400115966797 + "x": 1821.737060546875, + "y": -120.35199737548828 }, { - "x": 1699.6920166015625, - "y": -105.53800201416016 + "x": 1823.511962890625, + "y": -118.23300170898438 }, { - "x": 1701.2569580078125, - "y": -103.57099914550781 + "x": 1825.260986328125, + "y": -116.09200286865234 }, { - "x": 1702.7979736328125, - "y": -101.58599853515625 + "x": 1826.9830322265625, + "y": -113.92900085449219 }, { - "x": 1704.31298828125, - "y": -99.58000183105469 + "x": 1828.677001953125, + "y": -111.74400329589844 }, { - "x": 1705.802978515625, - "y": -97.55699920654297 + "x": 1830.343994140625, + "y": -109.53900146484375 }, { - "x": 1707.2669677734375, - "y": -95.51399993896484 + "x": 1831.9830322265625, + "y": -107.31199645996094 }, { - "x": 1708.7060546875, - "y": -93.4530029296875 + "x": 1833.593994140625, + "y": -105.06500244140625 }, { - "x": 1710.1190185546875, - "y": -91.375 + "x": 1835.177001953125, + "y": -102.79900360107422 }, { - "x": 1711.5050048828125, - "y": -89.27799987792969 + "x": 1836.73095703125, + "y": -100.51200103759766 }, { - "x": 1712.864990234375, - "y": -87.16500091552734 + "x": 1838.2559814453125, + "y": -98.20600128173828 }, { - "x": 1714.197998046875, - "y": -85.03399658203125 + "x": 1839.751953125, + "y": -95.88099670410156 }, { - "x": 1715.5050048828125, - "y": -82.88700103759766 + "x": 1841.218017578125, + "y": -93.53800201416016 }, { - "x": 1716.7840576171875, - "y": -80.7239990234375 + "x": 1842.655029296875, + "y": -91.1760025024414 }, { - "x": 1718.0360107421875, - "y": -78.54499816894531 + "x": 1844.06298828125, + "y": -88.7969970703125 }, { - "x": 1718.126953125, - "y": -78.46499633789062 + "x": 1845.43994140625, + "y": -86.4000015258789 }, { - "x": 1720.0989990234375, - "y": -74.8030014038086 + "x": 1846.7869873046875, + "y": -83.98500061035156 + }, + { + "x": 1848.10400390625, + "y": -81.55400085449219 + }, + { + "x": 1847.5439453125, + "y": -82.6780014038086 + }, + { + "x": 1849.4530029296875, + "y": -78.98300170898438 } ], "isCurve": true, @@ -5200,304 +5328,312 @@ "link": "", "route": [ { - "x": 1741.9110107421875, - "y": -8.803000450134277 + "x": 1871.197021484375, + "y": -12.982999801635742 }, { - "x": 1742.092041015625, - "y": -7.558000087738037 + "x": 1871.5030517578125, + "y": -11.048999786376953 }, { - "x": 1742.4219970703125, - "y": -5.065999984741211 + "x": 1871.9010009765625, + "y": -8.312999725341797 }, { - "x": 1742.7220458984375, - "y": -2.571000099182129 + "x": 1872.2650146484375, + "y": -5.572999954223633 }, { - "x": 1742.989990234375, - "y": -0.07199999690055847 + "x": 1872.593994140625, + "y": -2.828000068664551 }, { - "x": 1743.2259521484375, - "y": 2.428999900817871 + "x": 1872.8890380859375, + "y": -0.07900000363588333 }, { - "x": 1743.4310302734375, - "y": 4.934000015258789 + "x": 1873.1490478515625, + "y": 2.671999931335449 }, { - "x": 1743.60498046875, - "y": 7.440999984741211 + "x": 1873.3740234375, + "y": 5.427999973297119 }, { - "x": 1743.7469482421875, - "y": 9.951000213623047 + "x": 1873.56494140625, + "y": 8.185999870300293 }, { - "x": 1743.8570556640625, - "y": 12.461000442504883 + "x": 1873.7220458984375, + "y": 10.946000099182129 }, { - "x": 1743.93603515625, - "y": 14.972999572753906 + "x": 1873.843017578125, + "y": 13.708000183105469 }, { - "x": 1743.9840087890625, - "y": 17.486000061035156 + "x": 1873.9300537109375, + "y": 16.47100067138672 }, { - "x": 1744, - "y": 20 + "x": 1873.9820556640625, + "y": 19.235000610351562 }, { - "x": 1743.9840087890625, - "y": 22.51300048828125 + "x": 1874, + "y": 22 }, { - "x": 1743.93603515625, - "y": 25.025999069213867 + "x": 1873.9820556640625, + "y": 24.763999938964844 }, { - "x": 1743.8570556640625, - "y": 27.538000106811523 + "x": 1873.9300537109375, + "y": 27.527999877929688 }, { - "x": 1743.7469482421875, - "y": 30.04800033569336 + "x": 1873.843017578125, + "y": 30.291000366210938 }, { - "x": 1743.60498046875, - "y": 32.55799865722656 + "x": 1873.7220458984375, + "y": 33.053001403808594 }, { - "x": 1743.4310302734375, - "y": 35.064998626708984 + "x": 1873.56494140625, + "y": 35.8129997253418 }, { - "x": 1743.2259521484375, - "y": 37.56999969482422 + "x": 1873.3740234375, + "y": 38.57099914550781 }, { - "x": 1742.989990234375, - "y": 40.071998596191406 + "x": 1873.1490478515625, + "y": 41.32699966430664 }, { - "x": 1742.7220458984375, - "y": 42.57099914550781 + "x": 1872.8890380859375, + "y": 44.07899856567383 }, { - "x": 1742.4219970703125, - "y": 45.066001892089844 + "x": 1872.593994140625, + "y": 46.827999114990234 }, { - "x": 1742.092041015625, - "y": 47.55799865722656 + "x": 1872.2650146484375, + "y": 49.573001861572266 }, { - "x": 1741.72998046875, - "y": 50.04499816894531 + "x": 1871.9010009765625, + "y": 52.3129997253418 }, { - "x": 1741.3370361328125, - "y": 52.527000427246094 + "x": 1871.5030517578125, + "y": 55.04899978637695 }, { - "x": 1740.9119873046875, - "y": 55.00400161743164 + "x": 1871.0699462890625, + "y": 57.779998779296875 }, { - "x": 1740.45703125, - "y": 57.47600173950195 + "x": 1870.60400390625, + "y": 60.505001068115234 }, { - "x": 1739.970947265625, - "y": 59.941001892089844 + "x": 1870.10302734375, + "y": 63.222999572753906 }, { - "x": 1739.4530029296875, - "y": 62.4010009765625 + "x": 1869.5679931640625, + "y": 65.93599700927734 }, { - "x": 1738.905029296875, - "y": 64.85399627685547 + "x": 1868.998046875, + "y": 68.64099884033203 }, { - "x": 1738.3260498046875, - "y": 67.29900360107422 + "x": 1868.39501953125, + "y": 71.33899688720703 }, { - "x": 1737.7159423828125, - "y": 69.73699951171875 + "x": 1867.758056640625, + "y": 74.02899932861328 }, { - "x": 1737.0760498046875, - "y": 72.16799926757812 + "x": 1867.0880126953125, + "y": 76.71099853515625 }, { - "x": 1736.405029296875, - "y": 74.58999633789062 + "x": 1866.383056640625, + "y": 79.38500213623047 }, { - "x": 1735.7039794921875, - "y": 77.00299835205078 + "x": 1865.64599609375, + "y": 82.04900360107422 }, { - "x": 1734.9720458984375, - "y": 79.40799713134766 + "x": 1864.8740234375, + "y": 84.7040023803711 }, { - "x": 1734.2110595703125, - "y": 81.8030014038086 + "x": 1864.0699462890625, + "y": 87.3489990234375 }, { - "x": 1733.4189453125, - "y": 84.18800354003906 + "x": 1863.2320556640625, + "y": 89.98300170898438 }, { - "x": 1732.5980224609375, - "y": 86.56300354003906 + "x": 1862.3609619140625, + "y": 92.60700225830078 }, { - "x": 1731.7459716796875, - "y": 88.9280014038086 + "x": 1861.45703125, + "y": 95.22000122070312 }, { - "x": 1730.864990234375, - "y": 91.28199768066406 + "x": 1860.52099609375, + "y": 97.82099914550781 }, { - "x": 1729.9549560546875, - "y": 93.6240005493164 + "x": 1859.552001953125, + "y": 100.41000366210938 }, { - "x": 1729.0150146484375, - "y": 95.95500183105469 + "x": 1858.550048828125, + "y": 102.98699951171875 }, { - "x": 1728.0460205078125, - "y": 98.27400207519531 + "x": 1857.5159912109375, + "y": 105.5510025024414 }, { - "x": 1727.0479736328125, - "y": 100.58100128173828 + "x": 1856.4510498046875, + "y": 108.10199737548828 }, { - "x": 1726.02099609375, - "y": 102.875 + "x": 1855.35302734375, + "y": 110.63899993896484 }, { - "x": 1724.9649658203125, - "y": 105.15499877929688 + "x": 1854.2230224609375, + "y": 113.16200256347656 }, { - "x": 1723.8809814453125, - "y": 107.4229965209961 + "x": 1853.06103515625, + "y": 115.6709976196289 }, { - "x": 1722.7679443359375, - "y": 109.6760025024414 + "x": 1851.8690185546875, + "y": 118.16500091552734 }, { - "x": 1721.626953125, - "y": 111.91500091552734 + "x": 1850.64501953125, + "y": 120.64399719238281 }, { - "x": 1720.4580078125, - "y": 114.13999938964844 + "x": 1849.3900146484375, + "y": 123.10700225830078 }, { - "x": 1719.260986328125, - "y": 116.3499984741211 + "x": 1848.10400390625, + "y": 125.55400085449219 }, { - "x": 1718.0360107421875, - "y": 118.54499816894531 + "x": 1846.7869873046875, + "y": 127.98500061035156 }, { - "x": 1716.7840576171875, - "y": 120.7239990234375 + "x": 1845.43994140625, + "y": 130.39999389648438 }, { - "x": 1715.5050048828125, - "y": 122.88700103759766 + "x": 1844.06298828125, + "y": 132.7969970703125 }, { - "x": 1714.197998046875, - "y": 125.03399658203125 + "x": 1842.655029296875, + "y": 135.17599487304688 }, { - "x": 1712.864990234375, - "y": 127.16500091552734 + "x": 1841.218017578125, + "y": 137.53799438476562 }, { - "x": 1711.5050048828125, - "y": 129.2779998779297 + "x": 1839.751953125, + "y": 139.88099670410156 }, { - "x": 1710.1190185546875, - "y": 131.375 + "x": 1838.2559814453125, + "y": 142.20599365234375 }, { - "x": 1708.7060546875, - "y": 133.4530029296875 + "x": 1836.73095703125, + "y": 144.51199340820312 }, { - "x": 1707.2669677734375, - "y": 135.51400756835938 + "x": 1835.177001953125, + "y": 146.7989959716797 }, { - "x": 1705.802978515625, - "y": 137.5570068359375 + "x": 1833.593994140625, + "y": 149.06500244140625 }, { - "x": 1704.31298828125, - "y": 139.5800018310547 + "x": 1831.9830322265625, + "y": 151.31199645996094 }, { - "x": 1702.7979736328125, - "y": 141.58599853515625 + "x": 1830.343994140625, + "y": 153.53900146484375 }, { - "x": 1701.2569580078125, - "y": 143.5709991455078 + "x": 1828.677001953125, + "y": 155.74400329589844 }, { - "x": 1699.6920166015625, - "y": 145.53799438476562 + "x": 1826.9830322265625, + "y": 157.9290008544922 }, { - "x": 1698.10205078125, - "y": 147.48399353027344 + "x": 1825.260986328125, + "y": 160.0919952392578 }, { - "x": 1696.488037109375, - "y": 149.41099548339844 + "x": 1823.511962890625, + "y": 162.23300170898438 }, { - "x": 1694.8499755859375, - "y": 151.31700134277344 + "x": 1821.737060546875, + "y": 164.3520050048828 }, { - "x": 1693.18798828125, - "y": 153.20199584960938 + "x": 1819.93505859375, + "y": 166.447998046875 }, { - "x": 1691.501953125, - "y": 155.0659942626953 + "x": 1818.1070556640625, + "y": 168.52200317382812 }, { - "x": 1689.79296875, - "y": 156.90899658203125 + "x": 1816.251953125, + "y": 170.572998046875 }, { - "x": 1690.9420166015625, - "y": 155.73899841308594 + "x": 1814.373046875, + "y": 172.60000610351562 }, { - "x": 1688.0570068359375, - "y": 158.73500061035156 + "x": 1812.467041015625, + "y": 174.60299682617188 + }, + { + "x": 1812.748046875, + "y": 174.36199951171875 + }, + { + "x": 1809.81201171875, + "y": 177.30799865722656 } ], "isCurve": true, @@ -5532,312 +5668,320 @@ "link": "", "route": [ { - "x": 1635.0570068359375, - "y": 198.06399536132812 + "x": 1756.81201171875, + "y": 216.49400329589844 }, { - "x": 1633.676025390625, - "y": 198.76800537109375 + "x": 1755.1070556640625, + "y": 217.38999938964844 }, { - "x": 1631.4229736328125, - "y": 199.88099670410156 + "x": 1752.64404296875, + "y": 218.64500427246094 }, { - "x": 1629.155029296875, - "y": 200.96499633789062 + "x": 1750.1650390625, + "y": 219.86900329589844 }, { - "x": 1626.875, - "y": 202.02099609375 + "x": 1747.6710205078125, + "y": 221.06100463867188 }, { - "x": 1624.5810546875, - "y": 203.04800415039062 + "x": 1745.1619873046875, + "y": 222.22300720214844 }, { - "x": 1622.2740478515625, - "y": 204.04600524902344 + "x": 1742.6390380859375, + "y": 223.35299682617188 }, { - "x": 1619.9549560546875, - "y": 205.01499938964844 + "x": 1740.10205078125, + "y": 224.4510040283203 }, { - "x": 1617.6240234375, - "y": 205.9550018310547 + "x": 1737.551025390625, + "y": 225.51600646972656 }, { - "x": 1615.281982421875, - "y": 206.86500549316406 + "x": 1734.987060546875, + "y": 226.5500030517578 }, { - "x": 1612.927978515625, - "y": 207.74600219726562 + "x": 1732.4100341796875, + "y": 227.552001953125 }, { - "x": 1610.56298828125, - "y": 208.59800720214844 + "x": 1729.821044921875, + "y": 228.52099609375 }, { - "x": 1608.18798828125, - "y": 209.41900634765625 + "x": 1727.219970703125, + "y": 229.45700073242188 }, { - "x": 1605.802978515625, - "y": 210.21099853515625 + "x": 1724.6070556640625, + "y": 230.36099243164062 }, { - "x": 1603.407958984375, - "y": 210.9720001220703 + "x": 1721.9830322265625, + "y": 231.23199462890625 }, { - "x": 1601.0030517578125, - "y": 211.70399475097656 + "x": 1719.3489990234375, + "y": 232.07000732421875 }, { - "x": 1598.5899658203125, - "y": 212.40499877929688 + "x": 1716.7039794921875, + "y": 232.87399291992188 }, { - "x": 1596.16796875, - "y": 213.0760040283203 + "x": 1714.0489501953125, + "y": 233.64599609375 }, { - "x": 1593.737060546875, - "y": 213.71600341796875 + "x": 1711.385009765625, + "y": 234.38299560546875 }, { - "x": 1591.2989501953125, - "y": 214.3260040283203 + "x": 1708.7110595703125, + "y": 235.08799743652344 }, { - "x": 1588.85400390625, - "y": 214.90499877929688 + "x": 1706.029052734375, + "y": 235.75799560546875 }, { - "x": 1586.4010009765625, - "y": 215.4530029296875 + "x": 1703.3389892578125, + "y": 236.39500427246094 }, { - "x": 1583.9410400390625, - "y": 215.9709930419922 + "x": 1700.6409912109375, + "y": 236.9980010986328 }, { - "x": 1581.4759521484375, - "y": 216.45700073242188 + "x": 1697.93603515625, + "y": 237.5679931640625 }, { - "x": 1579.0040283203125, - "y": 216.91200256347656 + "x": 1695.2230224609375, + "y": 238.10299682617188 }, { - "x": 1576.5269775390625, - "y": 217.33700561523438 + "x": 1692.5050048828125, + "y": 238.60400390625 }, { - "x": 1574.0450439453125, - "y": 217.72999572753906 + "x": 1689.780029296875, + "y": 239.07000732421875 }, { - "x": 1571.5579833984375, - "y": 218.0919952392578 + "x": 1687.0489501953125, + "y": 239.5030059814453 }, { - "x": 1569.0660400390625, - "y": 218.4219970703125 + "x": 1684.31298828125, + "y": 239.9010009765625 }, { - "x": 1566.571044921875, - "y": 218.7220001220703 + "x": 1681.572998046875, + "y": 240.26499938964844 }, { - "x": 1564.072021484375, - "y": 218.99000549316406 + "x": 1678.8280029296875, + "y": 240.593994140625 }, { - "x": 1561.5699462890625, - "y": 219.2259979248047 + "x": 1676.0789794921875, + "y": 240.88900756835938 }, { - "x": 1559.06494140625, - "y": 219.43099975585938 + "x": 1673.3270263671875, + "y": 241.1490020751953 }, { - "x": 1556.5579833984375, - "y": 219.60499572753906 + "x": 1670.571044921875, + "y": 241.37399291992188 }, { - "x": 1554.0479736328125, - "y": 219.7469940185547 + "x": 1667.81298828125, + "y": 241.56500244140625 }, { - "x": 1551.5379638671875, - "y": 219.85699462890625 + "x": 1665.052978515625, + "y": 241.7220001220703 }, { - "x": 1549.0260009765625, - "y": 219.93600463867188 + "x": 1662.291015625, + "y": 241.84300231933594 }, { - "x": 1546.512939453125, - "y": 219.98399353027344 + "x": 1659.5279541015625, + "y": 241.92999267578125 }, { - "x": 1544, - "y": 220 + "x": 1656.7640380859375, + "y": 241.98199462890625 }, { - "x": 1541.4859619140625, - "y": 219.98399353027344 + "x": 1654, + "y": 242 }, { - "x": 1538.9730224609375, - "y": 219.93600463867188 + "x": 1651.2349853515625, + "y": 241.98199462890625 }, { - "x": 1536.4610595703125, - "y": 219.85699462890625 + "x": 1648.470947265625, + "y": 241.92999267578125 }, { - "x": 1533.9510498046875, - "y": 219.7469940185547 + "x": 1645.7080078125, + "y": 241.84300231933594 }, { - "x": 1531.4410400390625, - "y": 219.60499572753906 + "x": 1642.946044921875, + "y": 241.7220001220703 }, { - "x": 1528.9339599609375, - "y": 219.43099975585938 + "x": 1640.18603515625, + "y": 241.56500244140625 }, { - "x": 1526.428955078125, - "y": 219.2259979248047 + "x": 1637.427978515625, + "y": 241.37399291992188 }, { - "x": 1523.927001953125, - "y": 218.99000549316406 + "x": 1634.6719970703125, + "y": 241.1490020751953 }, { - "x": 1521.427978515625, - "y": 218.7220001220703 + "x": 1631.9200439453125, + "y": 240.88900756835938 }, { - "x": 1518.9329833984375, - "y": 218.4219970703125 + "x": 1629.1710205078125, + "y": 240.593994140625 }, { - "x": 1516.4410400390625, - "y": 218.0919952392578 + "x": 1626.426025390625, + "y": 240.26499938964844 }, { - "x": 1513.9539794921875, - "y": 217.72999572753906 + "x": 1623.68603515625, + "y": 239.9010009765625 }, { - "x": 1511.4720458984375, - "y": 217.33700561523438 + "x": 1620.949951171875, + "y": 239.5030059814453 }, { - "x": 1508.9949951171875, - "y": 216.91200256347656 + "x": 1618.218994140625, + "y": 239.07000732421875 }, { - "x": 1506.52294921875, - "y": 216.45700073242188 + "x": 1615.4940185546875, + "y": 238.60400390625 }, { - "x": 1504.0579833984375, - "y": 215.9709930419922 + "x": 1612.7760009765625, + "y": 238.10299682617188 }, { - "x": 1501.5980224609375, - "y": 215.4530029296875 + "x": 1610.06298828125, + "y": 237.5679931640625 }, { - "x": 1499.14501953125, - "y": 214.90499877929688 + "x": 1607.3580322265625, + "y": 236.9980010986328 }, { - "x": 1496.699951171875, - "y": 214.3260040283203 + "x": 1604.6600341796875, + "y": 236.39500427246094 }, { - "x": 1494.261962890625, - "y": 213.71600341796875 + "x": 1601.969970703125, + "y": 235.75799560546875 }, { - "x": 1491.8310546875, - "y": 213.0760040283203 + "x": 1599.2879638671875, + "y": 235.08799743652344 }, { - "x": 1489.4090576171875, - "y": 212.40499877929688 + "x": 1596.614013671875, + "y": 234.38299560546875 }, { - "x": 1486.9959716796875, - "y": 211.70399475097656 + "x": 1593.949951171875, + "y": 233.64599609375 }, { - "x": 1484.5909423828125, - "y": 210.9720001220703 + "x": 1591.2950439453125, + "y": 232.87399291992188 }, { - "x": 1482.196044921875, - "y": 210.21099853515625 + "x": 1588.6500244140625, + "y": 232.07000732421875 }, { - "x": 1479.81103515625, - "y": 209.41900634765625 + "x": 1586.0159912109375, + "y": 231.23199462890625 }, { - "x": 1477.43603515625, - "y": 208.59800720214844 + "x": 1583.3919677734375, + "y": 230.36099243164062 }, { - "x": 1475.071044921875, - "y": 207.74600219726562 + "x": 1580.779052734375, + "y": 229.45700073242188 }, { - "x": 1472.717041015625, - "y": 206.86500549316406 + "x": 1578.177978515625, + "y": 228.52099609375 }, { - "x": 1470.375, - "y": 205.9550018310547 + "x": 1575.5889892578125, + "y": 227.552001953125 }, { - "x": 1468.0439453125, - "y": 205.01499938964844 + "x": 1573.011962890625, + "y": 226.5500030517578 }, { - "x": 1465.7249755859375, - "y": 204.04600524902344 + "x": 1570.447998046875, + "y": 225.51600646972656 }, { - "x": 1463.41796875, - "y": 203.04800415039062 + "x": 1567.89697265625, + "y": 224.4510040283203 }, { - "x": 1461.1240234375, - "y": 202.02099609375 + "x": 1565.3599853515625, + "y": 223.35299682617188 }, { - "x": 1458.843994140625, - "y": 200.96499633789062 + "x": 1562.8370361328125, + "y": 222.22300720214844 }, { - "x": 1456.5760498046875, - "y": 199.88099670410156 + "x": 1560.3280029296875, + "y": 221.06100463867188 }, { - "x": 1457.1510009765625, - "y": 200.20199584960938 + "x": 1557.833984375, + "y": 219.86900329589844 }, { - "x": 1453.4420166015625, - "y": 198.31900024414062 + "x": 1555.35498046875, + "y": 218.64500427246094 + }, + { + "x": 1555.3690185546875, + "y": 218.69000244140625 + }, + { + "x": 1551.68701171875, + "y": 216.75599670410156 } ], "isCurve": true, @@ -5872,300 +6016,312 @@ "link": "", "route": [ { - "x": 1399.4420166015625, - "y": 158.20899963378906 + "x": 1497.68701171875, + "y": 176.80799865722656 }, { - "x": 1398.2060546875, - "y": 156.90899658203125 + "x": 1497.4620361328125, + "y": 176.58200073242188 }, { - "x": 1396.4969482421875, - "y": 155.0659942626953 + "x": 1495.531982421875, + "y": 174.60299682617188 }, { - "x": 1394.81103515625, - "y": 153.20199584960938 + "x": 1493.6259765625, + "y": 172.60000610351562 }, { - "x": 1393.1490478515625, - "y": 151.31700134277344 + "x": 1491.7469482421875, + "y": 170.572998046875 }, { - "x": 1391.510986328125, - "y": 149.41099548339844 + "x": 1489.8919677734375, + "y": 168.52200317382812 }, { - "x": 1389.89697265625, - "y": 147.48399353027344 + "x": 1488.06396484375, + "y": 166.447998046875 }, { - "x": 1388.3070068359375, - "y": 145.53799438476562 + "x": 1486.261962890625, + "y": 164.3520050048828 }, { - "x": 1386.741943359375, - "y": 143.5709991455078 + "x": 1484.487060546875, + "y": 162.23300170898438 }, { - "x": 1385.2010498046875, - "y": 141.58599853515625 + "x": 1482.738037109375, + "y": 160.0919952392578 }, { - "x": 1383.68603515625, - "y": 139.5800018310547 + "x": 1481.0159912109375, + "y": 157.9290008544922 }, { - "x": 1382.196044921875, - "y": 137.5570068359375 + "x": 1479.322021484375, + "y": 155.74400329589844 }, { - "x": 1380.7320556640625, - "y": 135.51400756835938 + "x": 1477.655029296875, + "y": 153.53900146484375 }, { - "x": 1379.29296875, - "y": 133.4530029296875 + "x": 1476.0159912109375, + "y": 151.31199645996094 }, { - "x": 1377.8800048828125, - "y": 131.375 + "x": 1474.405029296875, + "y": 149.06500244140625 }, { - "x": 1376.4940185546875, - "y": 129.2779998779297 + "x": 1472.822021484375, + "y": 146.7989959716797 }, { - "x": 1375.134033203125, - "y": 127.16500091552734 + "x": 1471.2679443359375, + "y": 144.51199340820312 }, { - "x": 1373.801025390625, - "y": 125.03399658203125 + "x": 1469.7430419921875, + "y": 142.20599365234375 }, { - "x": 1372.4940185546875, - "y": 122.88700103759766 + "x": 1468.2469482421875, + "y": 139.88099670410156 }, { - "x": 1371.2149658203125, - "y": 120.7239990234375 + "x": 1466.781005859375, + "y": 137.53799438476562 }, { - "x": 1369.9630126953125, - "y": 118.54499816894531 + "x": 1465.343994140625, + "y": 135.17599487304688 }, { - "x": 1368.738037109375, - "y": 116.3499984741211 + "x": 1463.93603515625, + "y": 132.7969970703125 }, { - "x": 1367.541015625, - "y": 114.13999938964844 + "x": 1462.5589599609375, + "y": 130.39999389648438 }, { - "x": 1366.3719482421875, - "y": 111.91500091552734 + "x": 1461.2120361328125, + "y": 127.98500061035156 }, { - "x": 1365.23095703125, - "y": 109.6760025024414 + "x": 1459.89501953125, + "y": 125.55400085449219 }, { - "x": 1364.1180419921875, - "y": 107.4229965209961 + "x": 1458.6090087890625, + "y": 123.10700225830078 }, { - "x": 1363.0340576171875, - "y": 105.15499877929688 + "x": 1457.35400390625, + "y": 120.64399719238281 }, { - "x": 1361.97802734375, - "y": 102.875 + "x": 1456.1300048828125, + "y": 118.16500091552734 }, { - "x": 1360.9510498046875, - "y": 100.58100128173828 + "x": 1454.93798828125, + "y": 115.6709976196289 }, { - "x": 1359.9530029296875, - "y": 98.27400207519531 + "x": 1453.7760009765625, + "y": 113.16200256347656 }, { - "x": 1358.9840087890625, - "y": 95.95500183105469 + "x": 1452.64599609375, + "y": 110.63899993896484 }, { - "x": 1358.0439453125, - "y": 93.6240005493164 + "x": 1451.5479736328125, + "y": 108.10199737548828 }, { - "x": 1357.134033203125, - "y": 91.28199768066406 + "x": 1450.4830322265625, + "y": 105.5510025024414 }, { - "x": 1356.2530517578125, - "y": 88.9280014038086 + "x": 1449.448974609375, + "y": 102.98699951171875 }, { - "x": 1355.4010009765625, - "y": 86.56300354003906 + "x": 1448.447021484375, + "y": 100.41000366210938 }, { - "x": 1354.5799560546875, - "y": 84.18800354003906 + "x": 1447.47802734375, + "y": 97.82099914550781 }, { - "x": 1353.7879638671875, - "y": 81.8030014038086 + "x": 1446.5419921875, + "y": 95.22000122070312 }, { - "x": 1353.0269775390625, - "y": 79.40799713134766 + "x": 1445.637939453125, + "y": 92.60700225830078 }, { - "x": 1352.2950439453125, - "y": 77.00299835205078 + "x": 1444.7669677734375, + "y": 89.98300170898438 }, { - "x": 1351.593994140625, - "y": 74.58999633789062 + "x": 1443.928955078125, + "y": 87.3489990234375 }, { - "x": 1350.9229736328125, - "y": 72.16799926757812 + "x": 1443.125, + "y": 84.7040023803711 }, { - "x": 1350.282958984375, - "y": 69.73699951171875 + "x": 1442.35302734375, + "y": 82.04900360107422 }, { - "x": 1349.6729736328125, - "y": 67.29900360107422 + "x": 1441.615966796875, + "y": 79.38500213623047 }, { - "x": 1349.093994140625, - "y": 64.85399627685547 + "x": 1440.9110107421875, + "y": 76.71099853515625 }, { - "x": 1348.5460205078125, - "y": 62.4010009765625 + "x": 1440.240966796875, + "y": 74.02899932861328 }, { - "x": 1348.0279541015625, - "y": 59.941001892089844 + "x": 1439.60400390625, + "y": 71.33899688720703 }, { - "x": 1347.5419921875, - "y": 57.47600173950195 + "x": 1439.0009765625, + "y": 68.64099884033203 }, { - "x": 1347.0870361328125, - "y": 55.00400161743164 + "x": 1438.4310302734375, + "y": 65.93599700927734 }, { - "x": 1346.6619873046875, - "y": 52.527000427246094 + "x": 1437.89599609375, + "y": 63.222999572753906 }, { - "x": 1346.26904296875, - "y": 50.04499816894531 + "x": 1437.39501953125, + "y": 60.505001068115234 }, { - "x": 1345.906982421875, - "y": 47.55799865722656 + "x": 1436.928955078125, + "y": 57.779998779296875 }, { - "x": 1345.5770263671875, - "y": 45.066001892089844 + "x": 1436.4959716796875, + "y": 55.04899978637695 }, { - "x": 1345.2769775390625, - "y": 42.57099914550781 + "x": 1436.0980224609375, + "y": 52.3129997253418 }, { - "x": 1345.009033203125, - "y": 40.071998596191406 + "x": 1435.7340087890625, + "y": 49.573001861572266 }, { - "x": 1344.77294921875, - "y": 37.56999969482422 + "x": 1435.405029296875, + "y": 46.827999114990234 }, { - "x": 1344.5679931640625, - "y": 35.064998626708984 + "x": 1435.1099853515625, + "y": 44.07899856567383 }, { - "x": 1344.39404296875, - "y": 32.55799865722656 + "x": 1434.8499755859375, + "y": 41.32699966430664 }, { - "x": 1344.251953125, - "y": 30.04800033569336 + "x": 1434.625, + "y": 38.57099914550781 }, { - "x": 1344.1419677734375, - "y": 27.538000106811523 + "x": 1434.4339599609375, + "y": 35.8129997253418 }, { - "x": 1344.06298828125, - "y": 25.025999069213867 + "x": 1434.2769775390625, + "y": 33.053001403808594 }, { - "x": 1344.0150146484375, - "y": 22.51300048828125 + "x": 1434.156005859375, + "y": 30.291000366210938 }, { - "x": 1344, - "y": 20 + "x": 1434.0689697265625, + "y": 27.527999877929688 }, { - "x": 1344.0150146484375, - "y": 17.486000061035156 + "x": 1434.0169677734375, + "y": 24.763999938964844 }, { - "x": 1344.06298828125, - "y": 14.972999572753906 + "x": 1434, + "y": 22 }, { - "x": 1344.1419677734375, - "y": 12.461000442504883 + "x": 1434.0169677734375, + "y": 19.235000610351562 }, { - "x": 1344.251953125, - "y": 9.951000213623047 + "x": 1434.0689697265625, + "y": 16.47100067138672 }, { - "x": 1344.39404296875, - "y": 7.440999984741211 + "x": 1434.156005859375, + "y": 13.708000183105469 }, { - "x": 1344.5679931640625, - "y": 4.934000015258789 + "x": 1434.2769775390625, + "y": 10.946000099182129 }, { - "x": 1344.77294921875, - "y": 2.428999900817871 + "x": 1434.4339599609375, + "y": 8.185999870300293 }, { - "x": 1345.009033203125, - "y": -0.07199999690055847 + "x": 1434.625, + "y": 5.427999973297119 }, { - "x": 1345.2769775390625, - "y": -2.571000099182129 + "x": 1434.8499755859375, + "y": 2.671999931335449 }, { - "x": 1345.5770263671875, - "y": -5.065999984741211 + "x": 1435.1099853515625, + "y": -0.07900000363588333 }, { - "x": 1345.489013671875, - "y": -4.686999797821045 + "x": 1435.405029296875, + "y": -2.828000068664551 }, { - "x": 1346.0880126953125, - "y": -8.803000450134277 + "x": 1435.7340087890625, + "y": -5.572999954223633 + }, + { + "x": 1436.0980224609375, + "y": -8.312999725341797 + }, + { + "x": 1436.1409912109375, + "y": -8.876999855041504 + }, + { + "x": 1436.802001953125, + "y": -12.982999801635742 } ], "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 b1b31e77f..15bd39d32 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 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-1531132284 .fill-N1{fill:#0A0F25;} + .d2-1531132284 .fill-N2{fill:#676C7E;} + .d2-1531132284 .fill-N3{fill:#9499AB;} + .d2-1531132284 .fill-N4{fill:#CFD2DD;} + .d2-1531132284 .fill-N5{fill:#DEE1EB;} + .d2-1531132284 .fill-N6{fill:#EEF1F8;} + .d2-1531132284 .fill-N7{fill:#FFFFFF;} + .d2-1531132284 .fill-B1{fill:#0D32B2;} + .d2-1531132284 .fill-B2{fill:#0D32B2;} + .d2-1531132284 .fill-B3{fill:#E3E9FD;} + .d2-1531132284 .fill-B4{fill:#E3E9FD;} + .d2-1531132284 .fill-B5{fill:#EDF0FD;} + .d2-1531132284 .fill-B6{fill:#F7F8FE;} + .d2-1531132284 .fill-AA2{fill:#4A6FF3;} + .d2-1531132284 .fill-AA4{fill:#EDF0FD;} + .d2-1531132284 .fill-AA5{fill:#F7F8FE;} + .d2-1531132284 .fill-AB4{fill:#EDF0FD;} + .d2-1531132284 .fill-AB5{fill:#F7F8FE;} + .d2-1531132284 .stroke-N1{stroke:#0A0F25;} + .d2-1531132284 .stroke-N2{stroke:#676C7E;} + .d2-1531132284 .stroke-N3{stroke:#9499AB;} + .d2-1531132284 .stroke-N4{stroke:#CFD2DD;} + .d2-1531132284 .stroke-N5{stroke:#DEE1EB;} + .d2-1531132284 .stroke-N6{stroke:#EEF1F8;} + .d2-1531132284 .stroke-N7{stroke:#FFFFFF;} + .d2-1531132284 .stroke-B1{stroke:#0D32B2;} + .d2-1531132284 .stroke-B2{stroke:#0D32B2;} + .d2-1531132284 .stroke-B3{stroke:#E3E9FD;} + .d2-1531132284 .stroke-B4{stroke:#E3E9FD;} + .d2-1531132284 .stroke-B5{stroke:#EDF0FD;} + .d2-1531132284 .stroke-B6{stroke:#F7F8FE;} + .d2-1531132284 .stroke-AA2{stroke:#4A6FF3;} + .d2-1531132284 .stroke-AA4{stroke:#EDF0FD;} + .d2-1531132284 .stroke-AA5{stroke:#F7F8FE;} + .d2-1531132284 .stroke-AB4{stroke:#EDF0FD;} + .d2-1531132284 .stroke-AB5{stroke:#F7F8FE;} + .d2-1531132284 .background-color-N1{background-color:#0A0F25;} + .d2-1531132284 .background-color-N2{background-color:#676C7E;} + .d2-1531132284 .background-color-N3{background-color:#9499AB;} + .d2-1531132284 .background-color-N4{background-color:#CFD2DD;} + .d2-1531132284 .background-color-N5{background-color:#DEE1EB;} + .d2-1531132284 .background-color-N6{background-color:#EEF1F8;} + .d2-1531132284 .background-color-N7{background-color:#FFFFFF;} + .d2-1531132284 .background-color-B1{background-color:#0D32B2;} + .d2-1531132284 .background-color-B2{background-color:#0D32B2;} + .d2-1531132284 .background-color-B3{background-color:#E3E9FD;} + .d2-1531132284 .background-color-B4{background-color:#E3E9FD;} + .d2-1531132284 .background-color-B5{background-color:#EDF0FD;} + .d2-1531132284 .background-color-B6{background-color:#F7F8FE;} + .d2-1531132284 .background-color-AA2{background-color:#4A6FF3;} + .d2-1531132284 .background-color-AA4{background-color:#EDF0FD;} + .d2-1531132284 .background-color-AA5{background-color:#F7F8FE;} + .d2-1531132284 .background-color-AB4{background-color:#EDF0FD;} + .d2-1531132284 .background-color-AB5{background-color:#F7F8FE;} + .d2-1531132284 .color-N1{color:#0A0F25;} + .d2-1531132284 .color-N2{color:#676C7E;} + .d2-1531132284 .color-N3{color:#9499AB;} + .d2-1531132284 .color-N4{color:#CFD2DD;} + .d2-1531132284 .color-N5{color:#DEE1EB;} + .d2-1531132284 .color-N6{color:#EEF1F8;} + .d2-1531132284 .color-N7{color:#FFFFFF;} + .d2-1531132284 .color-B1{color:#0D32B2;} + .d2-1531132284 .color-B2{color:#0D32B2;} + .d2-1531132284 .color-B3{color:#E3E9FD;} + .d2-1531132284 .color-B4{color:#E3E9FD;} + .d2-1531132284 .color-B5{color:#EDF0FD;} + .d2-1531132284 .color-B6{color:#F7F8FE;} + .d2-1531132284 .color-AA2{color:#4A6FF3;} + .d2-1531132284 .color-AA4{color:#EDF0FD;} + .d2-1531132284 .color-AA5{color:#F7F8FE;} + .d2-1531132284 .color-AB4{color:#EDF0FD;} + .d2-1531132284 .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-1531132284);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1531132284);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1531132284);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1531132284);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1531132284);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1531132284);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1531132284);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index bc4abcf55..e740172e7 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 454, - "height": 466, + "width": 494, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -221 + "y": -241 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 185, + "x": 205, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 179 + "y": 199 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -215, + "x": -235, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 485, - "y": 61 + "x": 525, + "y": 66 }, - "width": 400, - "height": 367, + "width": 435, + "height": 397, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 459, - "y": -171 + "x": 499, + "y": -186 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 632, - "y": 128 + "x": 689, + "y": 143 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 285, - "y": 129 + "x": 308, + "y": 144 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 904, + "x": 979, "y": 12 }, "width": 53, - "height": 466, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 878, - "y": -221 + "x": 953, + "y": -241 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 878, - "y": 179 + "x": 953, + "y": 199 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 977, + "x": 1052, "y": 12 }, - "width": 400, - "height": 466, + "width": 435, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 951, - "y": -221 + "x": 1026, + "y": -241 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1124, - "y": -121 + "x": 1216, + "y": -131 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1124, - "y": 78 + "x": 1216, + "y": 88 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 950, - "y": 179 + "x": 1025, + "y": 199 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 778, - "y": 79 + "x": 835, + "y": 89 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 779, - "y": -121 + "x": 836, + "y": -131 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1397, - "y": 31 + "x": 1506, + "y": 33 }, - "width": 434, - "height": 428, + "width": 472, + "height": 464, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1370, - "y": -201 + "x": 1480, + "y": -219 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1561, - "y": -63 + "x": 1689, + "y": -67 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1488, - "y": 159 + "x": 1609, + "y": 177 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1252, - "y": 159 + "x": 1350, + "y": 177 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1180, - "y": -63 + "x": 1270, + "y": -67 }, "width": 53, "height": 66, @@ -1085,334 +1085,342 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 + "y": -206.39199829101562 }, { - "x": 40.18000030517578, - "y": -186.00399780273438 + "x": 39.573001861572266, + "y": -206.26499938964844 }, { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 42.99800109863281, + "y": -205.80499267578125 }, { - "x": 46.3849983215332, - "y": -185.02099609375 + "x": 46.415000915527344, + "y": -205.29100036621094 }, { - "x": 49.47600173950195, - "y": -184.45700073242188 + "x": 49.82400131225586, + "y": -204.7239990234375 }, { - "x": 52.55699920654297, - "y": -183.843994140625 + "x": 53.222999572753906, + "y": -204.10299682617188 }, { - "x": 55.62799835205078, - "y": -183.18299865722656 + "x": 56.612998962402344, + "y": -203.4290008544922 }, { - "x": 58.68899917602539, - "y": -182.47300720214844 + "x": 59.99100112915039, + "y": -202.7010040283203 }, { - "x": 61.73699951171875, - "y": -181.71600341796875 + "x": 63.356998443603516, + "y": -201.92100524902344 }, { - "x": 64.77400207519531, - "y": -180.91099548339844 + "x": 66.71099853515625, + "y": -201.08799743652344 }, { - "x": 67.7979965209961, - "y": -180.05799865722656 + "x": 70.052001953125, + "y": -200.20199584960938 }, { - "x": 70.80799865722656, - "y": -179.1580047607422 + "x": 73.37799835205078, + "y": -199.26400756835938 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 76.68800354003906, + "y": -198.2740020751953 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 79.98300170898438, + "y": -197.23199462890625 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 83.26100158691406, + "y": -196.13800048828125 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 86.52200317382812, + "y": -194.9929962158203 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 89.76399993896484, + "y": -193.7969970703125 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 92.98699951171875, + "y": -192.5500030517578 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 96.19000244140625, + "y": -191.2530059814453 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 99.37200164794922, + "y": -189.906005859375 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 102.53299713134766, + "y": -188.50799560546875 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 105.6709976196289, + "y": -187.06100463867188 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 108.78600311279297, + "y": -185.5659942626953 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 111.87699890136719, + "y": -184.02099609375 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 114.94400024414062, + "y": -182.42799377441406 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 117.98500061035156, + "y": -180.78700256347656 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 121, + "y": -179.09800720214844 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 123.98899841308594, + "y": -177.36300659179688 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 126.9489974975586, + "y": -175.5800018310547 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 129.88099670410156, + "y": -173.7519989013672 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 132.78500366210938, + "y": -171.8769989013672 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 135.6580047607422, + "y": -169.95700073242188 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 138.50100708007812, + "y": -167.99200439453125 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 141.31199645996094, + "y": -165.98300170898438 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 144.0919952392578, + "y": -163.92999267578125 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 146.83900451660156, + "y": -161.83399963378906 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 149.55299377441406, + "y": -159.69400024414062 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 152.23300170898438, + "y": -157.51199340820312 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 154.8780059814453, + "y": -155.28900146484375 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 157.48800659179688, + "y": -153.0240020751953 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 160.06199645996094, + "y": -150.71800231933594 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 162.60000610351562, + "y": -148.3730010986328 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 165.10000610351562, + "y": -145.98699951171875 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 167.56300354003906, + "y": -143.56300354003906 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 169.98699951171875, + "y": -141.10000610351562 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 172.3730010986328, + "y": -138.60000610351562 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 174.71800231933594, + "y": -136.06199645996094 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 177.0240020751953, + "y": -133.48800659179688 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 179.28900146484375, + "y": -130.8780059814453 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 181.51199340820312, + "y": -128.23300170898438 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 183.69400024414062, + "y": -125.5530014038086 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 185.83399963378906, + "y": -122.83899688720703 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 187.92999267578125, + "y": -120.09200286865234 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 189.98300170898438, + "y": -117.31199645996094 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 191.99200439453125, + "y": -114.5009994506836 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 193.95700073242188, + "y": -111.65799713134766 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 195.8769989013672, + "y": -108.78500366210938 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 197.7519989013672, + "y": -105.88099670410156 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 199.5800018310547, + "y": -102.9489974975586 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 201.36300659179688, + "y": -99.98899841308594 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 203.09800720214844, + "y": -97 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 204.78700256347656, + "y": -93.98500061035156 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 206.42799377441406, + "y": -90.94400024414062 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 208.02099609375, + "y": -87.87699890136719 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 209.5659942626953, + "y": -84.78600311279297 }, { - "x": 194.27999877929688, - "y": -70.302001953125 + "x": 211.06100463867188, + "y": -81.6709976196289 }, { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 212.50799560546875, + "y": -78.53299713134766 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 213.906005859375, + "y": -75.37200164794922 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 + "x": 215.2530059814453, + "y": -72.19000244140625 }, { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 216.5500030517578, + "y": -68.98699951171875 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 217.7969970703125, + "y": -65.76399993896484 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 218.9929962158203, + "y": -62.52199935913086 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 220.13800048828125, + "y": -59.26100158691406 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 + "x": 221.23199462890625, + "y": -55.983001708984375 }, { - "x": 204.05799865722656, - "y": -43.79800033569336 + "x": 222.2740020751953, + "y": -52.6879997253418 }, { - "x": 204.91099548339844, - "y": -40.77399826049805 + "x": 223.26400756835938, + "y": -49.37799835205078 }, { - "x": 205.71600341796875, - "y": -37.73699951171875 + "x": 224.20199584960938, + "y": -46.051998138427734 }, { - "x": 206.47300720214844, - "y": -34.68899917602539 + "x": 225.08799743652344, + "y": -42.71099853515625 }, { - "x": 207.18299865722656, - "y": -31.628000259399414 + "x": 225.92100524902344, + "y": -39.356998443603516 }, { - "x": 207.843994140625, - "y": -28.55699920654297 + "x": 226.7010040283203, + "y": -35.99100112915039 }, { - "x": 208.45700073242188, - "y": -25.47599983215332 + "x": 227.4290008544922, + "y": -32.612998962402344 }, { - "x": 208.5659942626953, - "y": -25.10099983215332 + "x": 228.10299682617188, + "y": -29.222999572753906 }, { - "x": 209.2519989013672, + "x": 228.7239990234375, + "y": -25.823999404907227 + }, + { + "x": 228.8800048828125, + "y": -25.111000061035156 + }, + { + "x": 229.50399780273438, "y": -21 } ], @@ -1448,336 +1456,344 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 229.50399780273438, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 + "x": 229.29100036621094, + "y": 46.415000915527344 }, { - "x": 208.45700073242188, - "y": 49.47600173950195 + "x": 228.7239990234375, + "y": 49.82400131225586 }, { - "x": 207.843994140625, - "y": 52.55699920654297 + "x": 228.10299682617188, + "y": 53.222999572753906 }, { - "x": 207.18299865722656, - "y": 55.62799835205078 + "x": 227.4290008544922, + "y": 56.612998962402344 }, { - "x": 206.47300720214844, - "y": 58.68899917602539 + "x": 226.7010040283203, + "y": 59.99100112915039 }, { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 225.92100524902344, + "y": 63.356998443603516 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 225.08799743652344, + "y": 66.71099853515625 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 + "x": 224.20199584960938, + "y": 70.052001953125 }, { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 223.26400756835938, + "y": 73.37799835205078 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 222.2740020751953, + "y": 76.68800354003906 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 + "x": 221.23199462890625, + "y": 79.98300170898438 }, { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 220.13800048828125, + "y": 83.26100158691406 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 218.9929962158203, + "y": 86.52200317382812 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 217.7969970703125, + "y": 89.76399993896484 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 216.5500030517578, + "y": 92.98699951171875 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 215.2530059814453, + "y": 96.19000244140625 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 213.906005859375, + "y": 99.37200164794922 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 + "x": 212.50799560546875, + "y": 102.53299713134766 }, { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 211.06100463867188, + "y": 105.6709976196289 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 209.5659942626953, + "y": 108.78600311279297 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 208.02099609375, + "y": 111.87699890136719 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 206.42799377441406, + "y": 114.94400024414062 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 + "x": 204.78700256347656, + "y": 117.98500061035156 }, { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 203.09800720214844, + "y": 121 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 201.36300659179688, + "y": 123.98899841308594 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 + "x": 199.5800018310547, + "y": 126.9489974975586 }, { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 197.7519989013672, + "y": 129.88099670410156 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 195.8769989013672, + "y": 132.78500366210938 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 193.95700073242188, + "y": 135.6580047607422 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 191.99200439453125, + "y": 138.50100708007812 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 189.98300170898438, + "y": 141.31199645996094 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 187.92999267578125, + "y": 144.0919952392578 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 + "x": 185.83399963378906, + "y": 146.83900451660156 }, { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 183.69400024414062, + "y": 149.55299377441406 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 181.51199340820312, + "y": 152.23300170898438 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 + "x": 179.28900146484375, + "y": 154.8780059814453 }, { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 177.0240020751953, + "y": 157.48800659179688 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 174.71800231933594, + "y": 160.06199645996094 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 172.3730010986328, + "y": 162.60000610351562 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 169.98699951171875, + "y": 165.10000610351562 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 167.56300354003906, + "y": 167.56300354003906 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 165.10000610351562, + "y": 169.98699951171875 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 + "x": 162.60000610351562, + "y": 172.3730010986328 }, { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 160.06199645996094, + "y": 174.71800231933594 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 157.48800659179688, + "y": 177.0240020751953 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 + "x": 154.8780059814453, + "y": 179.28900146484375 }, { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 152.23300170898438, + "y": 181.51199340820312 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 149.55299377441406, + "y": 183.69400024414062 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 146.83900451660156, + "y": 185.83399963378906 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 144.0919952392578, + "y": 187.92999267578125 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 + "x": 141.31199645996094, + "y": 189.98300170898438 }, { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 138.50100708007812, + "y": 191.99200439453125 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 135.6580047607422, + "y": 193.95700073242188 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 132.78500366210938, + "y": 195.8769989013672 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 129.88099670410156, + "y": 197.7519989013672 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 126.9489974975586, + "y": 199.5800018310547 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 123.98899841308594, + "y": 201.36300659179688 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 + "x": 121, + "y": 203.09800720214844 }, { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 117.98500061035156, + "y": 204.78700256347656 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 114.94400024414062, + "y": 206.42799377441406 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 + "x": 111.87699890136719, + "y": 208.02099609375 }, { - "x": 97.15499877929688, - "y": 192.96499633789062 + "x": 108.78600311279297, + "y": 209.5659942626953 }, { - "x": 94.302001953125, - "y": 194.27999877929688 + "x": 105.6709976196289, + "y": 211.06100463867188 }, { - "x": 91.42900085449219, - "y": 195.5500030517578 + "x": 102.53299713134766, + "y": 212.50799560546875 }, { - "x": 88.53600311279297, - "y": 196.77499389648438 + "x": 99.37200164794922, + "y": 213.906005859375 }, { - "x": 85.6240005493164, - "y": 197.9550018310547 + "x": 96.19000244140625, + "y": 215.2530059814453 }, { - "x": 82.69400024414062, - "y": 199.08799743652344 + "x": 92.98699951171875, + "y": 216.5500030517578 }, { - "x": 79.74700164794922, - "y": 200.17599487304688 + "x": 89.76399993896484, + "y": 217.7969970703125 }, { - "x": 76.78299713134766, - "y": 201.2169952392578 + "x": 86.52200317382812, + "y": 218.9929962158203 }, { - "x": 73.8030014038086, - "y": 202.21099853515625 + "x": 83.26100158691406, + "y": 220.13800048828125 }, { - "x": 70.80799865722656, - "y": 203.1580047607422 + "x": 79.98300170898438, + "y": 221.23199462890625 }, { - "x": 67.7979965209961, - "y": 204.05799865722656 + "x": 76.68800354003906, + "y": 222.2740020751953 }, { - "x": 64.77400207519531, - "y": 204.91099548339844 + "x": 73.37799835205078, + "y": 223.26400756835938 }, { - "x": 61.73699951171875, - "y": 205.71600341796875 + "x": 70.052001953125, + "y": 224.20199584960938 }, { - "x": 58.68899917602539, - "y": 206.47300720214844 + "x": 66.71099853515625, + "y": 225.08799743652344 }, { - "x": 55.62799835205078, - "y": 207.18299865722656 + "x": 63.356998443603516, + "y": 225.92100524902344 }, { - "x": 52.55699920654297, - "y": 207.843994140625 + "x": 59.99100112915039, + "y": 226.7010040283203 }, { - "x": 49.47600173950195, - "y": 208.45700073242188 + "x": 56.612998962402344, + "y": 227.4290008544922 }, { - "x": 46.3849983215332, - "y": 209.02099609375 + "x": 53.222999572753906, + "y": 228.10299682617188 }, { - "x": 43.2859992980957, - "y": 209.53700256347656 + "x": 49.82400131225586, + "y": 228.7239990234375 }, { - "x": 42.62200164794922, - "y": 209.6790008544922 + "x": 46.415000915527344, + "y": 229.29100036621094 + }, + { + "x": 42.99800109863281, + "y": 229.80499267578125 + }, + { + "x": 42.62799835205078, + "y": 229.89100646972656 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 230.39199829101562 } ], "isCurve": true, @@ -1813,334 +1829,342 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 + "y": 230.39199829101562 }, { - "x": -16.18000030517578, - "y": 210.00399780273438 + "x": -15.572999954223633, + "y": 230.26499938964844 }, { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": -18.99799919128418, + "y": 229.80499267578125 }, { - "x": -22.385000228881836, - "y": 209.02099609375 + "x": -22.415000915527344, + "y": 229.29100036621094 }, { - "x": -25.47599983215332, - "y": 208.45700073242188 + "x": -25.823999404907227, + "y": 228.7239990234375 }, { - "x": -28.55699920654297, - "y": 207.843994140625 + "x": -29.222999572753906, + "y": 228.10299682617188 }, { - "x": -31.628000259399414, - "y": 207.18299865722656 + "x": -32.612998962402344, + "y": 227.4290008544922 }, { - "x": -34.68899917602539, - "y": 206.47300720214844 + "x": -35.99100112915039, + "y": 226.7010040283203 }, { - "x": -37.73699951171875, - "y": 205.71600341796875 + "x": -39.356998443603516, + "y": 225.92100524902344 }, { - "x": -40.77399826049805, - "y": 204.91099548339844 + "x": -42.71099853515625, + "y": 225.08799743652344 }, { - "x": -43.79800033569336, - "y": 204.05799865722656 + "x": -46.051998138427734, + "y": 224.20199584960938 }, { - "x": -46.80799865722656, - "y": 203.1580047607422 + "x": -49.37799835205078, + "y": 223.26400756835938 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -52.6879997253418, + "y": 222.2740020751953 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -55.983001708984375, + "y": 221.23199462890625 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -59.26100158691406, + "y": 220.13800048828125 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 + "x": -62.52199935913086, + "y": 218.9929962158203 }, { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -65.76399993896484, + "y": 217.7969970703125 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -68.98699951171875, + "y": 216.5500030517578 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 + "x": -72.19000244140625, + "y": 215.2530059814453 }, { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -75.37200164794922, + "y": 213.906005859375 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -78.53299713134766, + "y": 212.50799560546875 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -81.6709976196289, + "y": 211.06100463867188 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -84.78600311279297, + "y": 209.5659942626953 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -87.87699890136719, + "y": 208.02099609375 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -90.94400024414062, + "y": 206.42799377441406 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 + "x": -93.98500061035156, + "y": 204.78700256347656 }, { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -97, + "y": 203.09800720214844 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -99.98899841308594, + "y": 201.36300659179688 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -102.9489974975586, + "y": 199.5800018310547 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -105.88099670410156, + "y": 197.7519989013672 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 + "x": -108.78500366210938, + "y": 195.8769989013672 }, { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -111.65799713134766, + "y": 193.95700073242188 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -114.5009994506836, + "y": 191.99200439453125 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 + "x": -117.31199645996094, + "y": 189.98300170898438 }, { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -120.09200286865234, + "y": 187.92999267578125 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -122.83899688720703, + "y": 185.83399963378906 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -125.5530014038086, + "y": 183.69400024414062 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -128.23300170898438, + "y": 181.51199340820312 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -130.8780059814453, + "y": 179.28900146484375 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -133.48800659179688, + "y": 177.0240020751953 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 + "x": -136.06199645996094, + "y": 174.71800231933594 }, { - "x": -127.18199920654297, - "y": 155.625 + "x": -138.60000610351562, + "y": 172.3730010986328 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -141.10000610351562, + "y": 169.98699951171875 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -143.56300354003906, + "y": 167.56300354003906 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -145.98699951171875, + "y": 165.10000610351562 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 + "x": -148.3730010986328, + "y": 162.60000610351562 }, { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -150.71800231933594, + "y": 160.06199645996094 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -153.0240020751953, + "y": 157.48800659179688 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 + "x": -155.28900146484375, + "y": 154.8780059814453 }, { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -157.51199340820312, + "y": 152.23300170898438 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -159.69400024414062, + "y": 149.55299377441406 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -161.83399963378906, + "y": 146.83900451660156 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -163.92999267578125, + "y": 144.0919952392578 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -165.98300170898438, + "y": 141.31199645996094 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -167.99200439453125, + "y": 138.50100708007812 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 + "x": -169.95700073242188, + "y": 135.6580047607422 }, { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -171.8769989013672, + "y": 132.78500366210938 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -173.7519989013672, + "y": 129.88099670410156 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 + "x": -175.5800018310547, + "y": 126.9489974975586 }, { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -177.36300659179688, + "y": 123.98899841308594 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -179.09800720214844, + "y": 121 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -180.78700256347656, + "y": 117.98500061035156 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -182.42799377441406, + "y": 114.94400024414062 }, { - "x": -167.60499572753906, - "y": 99.98699951171875 + "x": -184.02099609375, + "y": 111.87699890136719 }, { - "x": -168.96499633789062, - "y": 97.15499877929688 + "x": -185.5659942626953, + "y": 108.78600311279297 }, { - "x": -170.27999877929688, - "y": 94.302001953125 + "x": -187.06100463867188, + "y": 105.6709976196289 }, { - "x": -171.5500030517578, - "y": 91.42900085449219 + "x": -188.50799560546875, + "y": 102.53299713134766 }, { - "x": -172.77499389648438, - "y": 88.53600311279297 + "x": -189.906005859375, + "y": 99.37200164794922 }, { - "x": -173.9550018310547, - "y": 85.6240005493164 + "x": -191.2530059814453, + "y": 96.19000244140625 }, { - "x": -175.08799743652344, - "y": 82.69400024414062 + "x": -192.5500030517578, + "y": 92.98699951171875 }, { - "x": -176.17599487304688, - "y": 79.74700164794922 + "x": -193.7969970703125, + "y": 89.76399993896484 }, { - "x": -177.2169952392578, - "y": 76.78299713134766 + "x": -194.9929962158203, + "y": 86.52200317382812 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -196.13800048828125, + "y": 83.26100158691406 }, { - "x": -179.1580047607422, - "y": 70.80799865722656 + "x": -197.23199462890625, + "y": 79.98300170898438 }, { - "x": -180.05799865722656, - "y": 67.7979965209961 + "x": -198.2740020751953, + "y": 76.68800354003906 }, { - "x": -180.91099548339844, - "y": 64.77400207519531 + "x": -199.26400756835938, + "y": 73.37799835205078 }, { - "x": -181.71600341796875, - "y": 61.73699951171875 + "x": -200.20199584960938, + "y": 70.052001953125 }, { - "x": -182.47300720214844, - "y": 58.68899917602539 + "x": -201.08799743652344, + "y": 66.71099853515625 }, { - "x": -183.18299865722656, - "y": 55.62799835205078 + "x": -201.92100524902344, + "y": 63.356998443603516 }, { - "x": -183.843994140625, - "y": 52.55699920654297 + "x": -202.7010040283203, + "y": 59.99100112915039 }, { - "x": -184.45700073242188, - "y": 49.47600173950195 + "x": -203.4290008544922, + "y": 56.612998962402344 }, { - "x": -184.5659942626953, - "y": 49.10100173950195 + "x": -204.10299682617188, + "y": 53.222999572753906 }, { - "x": -185.2519989013672, + "x": -204.7239990234375, + "y": 49.82400131225586 + }, + { + "x": -204.8800048828125, + "y": 49.111000061035156 + }, + { + "x": -205.50399780273438, "y": 45 } ], @@ -2176,352 +2200,360 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 + "x": 552, + "y": -151.38900756835938 }, { - "x": 514.7160034179688, - "y": -135.85400390625 + "x": 553.072998046875, + "y": -151.26499938964844 }, { - "x": 518.85302734375, - "y": -135.19900512695312 + "x": 557.6380004882812, + "y": -150.63900756835938 }, { - "x": 522.9760131835938, - "y": -134.45700073242188 + "x": 562.1890258789062, + "y": -149.91900634765625 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 566.7230224609375, + "y": -149.10299682617188 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 571.239990234375, + "y": -148.19200134277344 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 575.7369995117188, + "y": -147.18699645996094 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 + "x": 580.2109985351562, + "y": -146.08799743652344 }, { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 584.6619873046875, + "y": -144.89500427246094 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 589.0859985351562, + "y": -143.61000061035156 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 593.4829711914062, + "y": -142.23199462890625 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 597.8499755859375, + "y": -140.76199340820312 }, { - "x": 559.1240234375, - "y": -123.95500183105469 + "x": 602.1849975585938, + "y": -139.20199584960938 }, { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 606.4869995117188, + "y": -137.5500030517578 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 610.7529907226562, + "y": -135.8090057373047 }, { - "x": 570.655029296875, - "y": -118.96499633789062 + "x": 614.9819946289062, + "y": -133.97999572753906 }, { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 619.1710205078125, + "y": -132.06100463867188 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 623.3189697265625, + "y": -130.05599975585938 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 627.4249877929688, + "y": -127.96399688720703 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 631.4849853515625, + "y": -125.78700256347656 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 635.5, + "y": -123.5250015258789 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 639.4650268554688, + "y": -121.18000030517578 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 643.3809814453125, + "y": -118.75199890136719 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 647.2459716796875, + "y": -116.24199676513672 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 651.0560302734375, + "y": -113.6520004272461 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 654.81201171875, + "y": -110.98300170898438 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 658.510986328125, + "y": -108.23600006103516 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 662.1519775390625, + "y": -105.41200256347656 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 665.7329711914062, + "y": -102.51200103759766 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 669.2520141601562, + "y": -99.53800201416016 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 672.7080078125, + "y": -96.49099731445312 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 676.0999755859375, + "y": -93.37300109863281 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 679.4249877929688, + "y": -90.18299865722656 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 682.6829833984375, + "y": -86.92500305175781 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 685.8729858398438, + "y": -83.5999984741211 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 688.9910278320312, + "y": -80.20800018310547 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 692.0380249023438, + "y": -76.75199890136719 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 695.0120239257812, + "y": -73.23300170898438 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 697.9119873046875, + "y": -69.6520004272461 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 700.7360229492188, + "y": -66.01100158691406 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 703.4829711914062, + "y": -62.3120002746582 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 706.1519775390625, + "y": -58.555999755859375 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 708.7420043945312, + "y": -54.74599838256836 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 711.2520141601562, + "y": -50.88100051879883 }, { - "x": 658.7050170898438, - "y": -38 + "x": 713.6799926757812, + "y": -46.96500015258789 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 716.0250244140625, + "y": -43 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 718.2869873046875, + "y": -38.98500061035156 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 720.4639892578125, + "y": -34.92499923706055 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 722.5560302734375, + "y": -30.819000244140625 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 724.5609741210938, + "y": -26.67099952697754 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 726.47998046875, + "y": -22.48200035095215 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 728.3090209960938, + "y": -18.253000259399414 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 730.0499877929688, + "y": -13.987000465393066 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 731.7020263671875, + "y": -9.6850004196167 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 733.2620239257812, + "y": -5.349999904632568 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 734.7319946289062, + "y": -0.9829999804496765 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 736.1099853515625, + "y": 3.4130001068115234 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 737.39501953125, + "y": 7.836999893188477 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 738.5880126953125, + "y": 12.288000106811523 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 739.68701171875, + "y": 16.761999130249023 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 740.6920166015625, + "y": 21.259000778198242 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 741.60302734375, + "y": 25.775999069213867 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 742.4190063476562, + "y": 30.309999465942383 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 743.1389770507812, + "y": 34.861000061035156 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 743.7650146484375, + "y": 39.42599868774414 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 744.2940063476562, + "y": 44.00299835205078 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 744.72802734375, + "y": 48.59000015258789 }, { - "x": 685.323974609375, - "y": 53.624000549316406 + "x": 745.0650024414062, + "y": 53.18600082397461 }, { - "x": 685.4559936523438, - "y": 57.81100082397461 + "x": 745.3070068359375, + "y": 57.7869987487793 }, { - "x": 685.5, - "y": 61.999000549316406 + "x": 745.4509887695312, + "y": 62.391998291015625 }, { - "x": 685.4559936523438, - "y": 66.18800354003906 + "x": 745.5, + "y": 66.9990005493164 }, { - "x": 685.323974609375, - "y": 70.375 + "x": 745.4509887695312, + "y": 71.60700225830078 }, { - "x": 685.10498046875, - "y": 74.55799865722656 + "x": 745.3070068359375, + "y": 76.21199798583984 }, { - "x": 684.7979736328125, - "y": 78.73500061035156 + "x": 745.0650024414062, + "y": 80.81300354003906 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 744.72802734375, + "y": 85.40899658203125 }, { - "x": 683.9219970703125, - "y": 87.06600189208984 + "x": 744.2940063476562, + "y": 89.99600219726562 }, { - "x": 683.35400390625, - "y": 91.21600341796875 + "x": 743.7650146484375, + "y": 94.572998046875 }, { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 743.1389770507812, + "y": 99.13800048828125 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 742.4190063476562, + "y": 103.68900299072266 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 741.60302734375, + "y": 108.2229995727539 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 740.6920166015625, + "y": 112.73999786376953 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 739.68701171875, + "y": 117.23699951171875 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 + "x": 738.5880126953125, + "y": 121.71099853515625 }, { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 737.39501953125, + "y": 126.16200256347656 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 736.1099853515625, + "y": 130.58599853515625 }, { - "x": 675.3259887695312, - "y": 125.08100128173828 + "x": 734.7319946289062, + "y": 134.98300170898438 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 733.2620239257812, + "y": 139.35000610351562 + }, + { + "x": 733.0369873046875, + "y": 140.10400390625 + }, + { + "x": 731.5809936523438, + "y": 143.99899291992188 } ], "isCurve": true, @@ -2556,336 +2588,344 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 + "x": 692.6740112304688, + "y": 209.99899291992188 }, { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 692.0380249023438, + "y": 210.7519989013672 }, { - "x": 631.2930297851562, - "y": 198.90899658203125 + "x": 688.9910278320312, + "y": 214.20799255371094 }, { - "x": 628.3939819335938, - "y": 201.9320068359375 + "x": 685.8729858398438, + "y": 217.60000610351562 }, { - "x": 625.4320068359375, - "y": 204.8939971923828 + "x": 682.6829833984375, + "y": 220.9250030517578 }, { - "x": 622.4089965820312, - "y": 207.79299926757812 + "x": 679.4249877929688, + "y": 224.18299865722656 }, { - "x": 619.3259887695312, - "y": 210.6280059814453 + "x": 676.0999755859375, + "y": 227.3730010986328 }, { - "x": 616.1840209960938, - "y": 213.3990020751953 + "x": 672.7080078125, + "y": 230.49099731445312 }, { - "x": 612.9840087890625, - "y": 216.1020050048828 + "x": 669.2520141601562, + "y": 233.53799438476562 }, { - "x": 609.72900390625, - "y": 218.73800659179688 + "x": 665.7329711914062, + "y": 236.51199340820312 }, { - "x": 606.4190063476562, - "y": 221.30499267578125 + "x": 662.1519775390625, + "y": 239.41200256347656 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 658.510986328125, + "y": 242.23599243164062 }, { - "x": 599.6420288085938, - "y": 226.22900390625 + "x": 654.81201171875, + "y": 244.98300170898438 }, { - "x": 596.177978515625, - "y": 228.58399963378906 + "x": 651.0560302734375, + "y": 247.65199279785156 }, { - "x": 592.6649780273438, - "y": 230.86500549316406 + "x": 647.2459716796875, + "y": 250.24200439453125 }, { - "x": 589.10498046875, - "y": 233.07200622558594 + "x": 643.3809814453125, + "y": 252.7519989013672 }, { - "x": 585.5, - "y": 235.2050018310547 + "x": 639.4650268554688, + "y": 255.17999267578125 }, { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 635.5, + "y": 257.5249938964844 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 631.4849853515625, + "y": 259.7869873046875 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 627.4249877929688, + "y": 261.9639892578125 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 623.3189697265625, + "y": 264.0559997558594 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 619.1710205078125, + "y": 266.0610046386719 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 614.9819946289062, + "y": 267.9800109863281 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 610.7529907226562, + "y": 269.8089904785156 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 606.4869995117188, + "y": 271.54998779296875 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 602.1849975585938, + "y": 273.2019958496094 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 597.8499755859375, + "y": 274.7619934082031 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 593.4829711914062, + "y": 276.23199462890625 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 589.0859985351562, + "y": 277.6099853515625 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 584.6619873046875, + "y": 278.8949890136719 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 580.2109985351562, + "y": 280.0880126953125 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 575.7369995117188, + "y": 281.18701171875 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 571.239990234375, + "y": 282.1919860839844 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 566.7230224609375, + "y": 283.1029968261719 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 562.1890258789062, + "y": 283.91900634765625 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 557.6380004882812, + "y": 284.6390075683594 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 553.072998046875, + "y": 285.2650146484375 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 548.4959716796875, + "y": 285.79400634765625 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 543.9089965820312, + "y": 286.2279968261719 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 539.31298828125, + "y": 286.56500244140625 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 534.7119750976562, + "y": 286.8070068359375 }, { - "x": 485.5, - "y": 262 + "x": 530.1069946289062, + "y": 286.95098876953125 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 525.5, + "y": 287 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 520.8920288085938, + "y": 286.95098876953125 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 516.2869873046875, + "y": 286.8070068359375 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 511.6860046386719, + "y": 286.56500244140625 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 507.0899963378906, + "y": 286.2279968261719 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 502.50299072265625, + "y": 285.79400634765625 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 497.9259948730469, + "y": 285.2650146484375 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 493.3609924316406, + "y": 284.6390075683594 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 488.80999755859375, + "y": 283.91900634765625 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 484.2760009765625, + "y": 283.1029968261719 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 479.7590026855469, + "y": 282.1919860839844 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 475.2619934082031, + "y": 281.18701171875 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 470.7879943847656, + "y": 280.0880126953125 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 466.3370056152344, + "y": 278.8949890136719 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 461.9129943847656, + "y": 277.6099853515625 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 457.5159912109375, + "y": 276.23199462890625 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 453.14898681640625, + "y": 274.7619934082031 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 448.8139953613281, + "y": 273.2019958496094 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 444.5119934082031, + "y": 271.54998779296875 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 440.2460021972656, + "y": 269.8089904785156 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 436.0169982910156, + "y": 267.9800109863281 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 431.8280029296875, + "y": 266.0610046386719 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 + "x": 427.67999267578125, + "y": 264.0559997558594 }, { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 423.5740051269531, + "y": 261.9639892578125 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 419.5140075683594, + "y": 259.7869873046875 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 + "x": 415.5, + "y": 257.5249938964844 }, { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 411.53399658203125, + "y": 255.17999267578125 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 407.6180114746094, + "y": 252.7519989013672 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 403.75299072265625, + "y": 250.24200439453125 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 399.9429931640625, + "y": 247.65199279785156 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 396.18701171875, + "y": 244.98300170898438 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 392.4880065917969, + "y": 242.23599243164062 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 + "x": 388.84698486328125, + "y": 239.41200256347656 }, { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 385.2659912109375, + "y": 236.51199340820312 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 381.74700927734375, + "y": 233.53799438476562 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 378.2909851074219, + "y": 230.49099731445312 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 374.89898681640625, + "y": 227.3730010986328 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 + "x": 371.5740051269531, + "y": 224.18299865722656 }, { - "x": 339.70599365234375, - "y": 198.90899658203125 + "x": 368.3160095214844, + "y": 220.9250030517578 }, { - "x": 338.9079895019531, - "y": 198.1060028076172 + "x": 365.1260070800781, + "y": 217.60000610351562 }, { - "x": 336.1419982910156, - "y": 195 + "x": 362.00799560546875, + "y": 214.20799255371094 + }, + { + "x": 361.02801513671875, + "y": 213.16000366210938 + }, + { + "x": 358.32501220703125, + "y": 210 } ], "isCurve": true, @@ -2920,376 +2960,384 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 + "x": 1006.051025390625, + "y": -206.38299560546875 }, { - "x": 936.197021484375, - "y": -185.53700256347656 + "x": 1007.1240234375, + "y": -206.26499938964844 }, { - "x": 942.385986328125, - "y": -184.45700073242188 + "x": 1013.9660034179688, + "y": -205.29100036621094 }, { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 1020.7750244140625, + "y": -204.10299682617188 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 1027.5419921875, + "y": -202.7010040283203 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 1034.261962890625, + "y": -201.08799743652344 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 1040.928955078125, + "y": -199.26400756835938 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 1047.5340576171875, + "y": -197.23199462890625 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 1054.072998046875, + "y": -194.9929962158203 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 1060.5379638671875, + "y": -192.5500030517578 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 1066.9229736328125, + "y": -189.906005859375 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 1073.2220458984375, + "y": -187.06100463867188 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 1079.428955078125, + "y": -184.02099609375 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 1085.5360107421875, + "y": -180.78700256347656 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 1091.5400390625, + "y": -177.36300659179688 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 1097.4329833984375, + "y": -173.7519989013672 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1103.208984375, + "y": -169.95700073242188 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 1108.863037109375, + "y": -165.98300170898438 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 1114.3900146484375, + "y": -161.83399963378906 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 1119.7840576171875, + "y": -157.51199340820312 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 1125.0389404296875, + "y": -153.0240020751953 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 1130.1510009765625, + "y": -148.3730010986328 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 1135.114013671875, + "y": -143.56300354003906 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 1139.9239501953125, + "y": -138.60000610351562 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 1144.574951171875, + "y": -133.48800659179688 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 1149.06396484375, + "y": -128.23300170898438 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 1153.385009765625, + "y": -122.83899688720703 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 1157.5340576171875, + "y": -117.31199645996094 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 1161.508056640625, + "y": -111.65799713134766 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 1165.302978515625, + "y": -105.88099670410156 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 1168.9139404296875, + "y": -99.98899841308594 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 1172.3380126953125, + "y": -93.98500061035156 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 1175.572021484375, + "y": -87.87699890136719 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 1178.613037109375, + "y": -81.6709976196289 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 1181.45703125, + "y": -75.37200164794922 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 1184.10205078125, + "y": -68.98699951171875 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1186.5439453125, + "y": -62.52199935913086 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 1188.782958984375, + "y": -55.983001708984375 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 1190.81494140625, + "y": -49.37799835205078 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 1192.6390380859375, + "y": -42.71099853515625 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 1194.251953125, + "y": -35.99100112915039 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 1195.654052734375, + "y": -29.222999572753906 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 + "x": 1196.842041015625, + "y": -22.415000915527344 }, { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 1197.8160400390625, + "y": -15.572999954223633 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 1198.573974609375, + "y": -8.70300006866455 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 + "x": 1199.116943359375, + "y": -1.812999963760376 }, { - "x": 1104.9100341796875, + "x": 1199.4420166015625, + "y": 5.089000225067139 + }, + { + "x": 1199.551025390625, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 + "x": 1199.4420166015625, + "y": 18.90999984741211 }, { - "x": 1104.5150146484375, - "y": 24.558000564575195 + "x": 1199.116943359375, + "y": 25.812999725341797 }, { - "x": 1104.02197265625, - "y": 30.820999145507812 + "x": 1198.573974609375, + "y": 32.702999114990234 }, { - "x": 1103.3330078125, - "y": 37.066001892089844 + "x": 1197.8160400390625, + "y": 39.573001861572266 }, { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 1196.842041015625, + "y": 46.415000915527344 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 1195.654052734375, + "y": 53.222999572753906 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 1194.251953125, + "y": 59.99100112915039 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 1192.6390380859375, + "y": 66.71099853515625 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 1190.81494140625, + "y": 73.37799835205078 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1188.782958984375, + "y": 79.98300170898438 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 1186.5439453125, + "y": 86.52200317382812 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 1184.10205078125, + "y": 92.98699951171875 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 1181.45703125, + "y": 99.37200164794922 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 1178.613037109375, + "y": 105.6709976196289 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 1175.572021484375, + "y": 111.87699890136719 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 1172.3380126953125, + "y": 117.98500061035156 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 1168.9139404296875, + "y": 123.98899841308594 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 1165.302978515625, + "y": 129.88099670410156 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 1161.508056640625, + "y": 135.6580047607422 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1157.5340576171875, + "y": 141.31199645996094 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 1153.385009765625, + "y": 146.83900451660156 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 1149.06396484375, + "y": 152.23300170898438 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 1144.574951171875, + "y": 157.48800659179688 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 1139.9239501953125, + "y": 162.60000610351562 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 1135.114013671875, + "y": 167.56300354003906 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 1130.1510009765625, + "y": 172.3730010986328 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 1125.0389404296875, + "y": 177.0240020751953 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 1119.7840576171875, + "y": 181.51199340820312 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 1114.3900146484375, + "y": 185.83399963378906 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 1108.863037109375, + "y": 189.98300170898438 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 1103.208984375, + "y": 193.95700073242188 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 1097.4329833984375, + "y": 197.7519989013672 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 1091.5400390625, + "y": 201.36300659179688 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 1085.5360107421875, + "y": 204.78700256347656 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 1079.428955078125, + "y": 208.02099609375 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 1073.2220458984375, + "y": 211.06100463867188 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 1066.9229736328125, + "y": 213.906005859375 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 1060.5379638671875, + "y": 216.5500030517578 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 1054.072998046875, + "y": 218.9929962158203 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 1047.5340576171875, + "y": 221.23199462890625 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 1040.928955078125, + "y": 223.26400756835938 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 + "x": 1034.261962890625, + "y": 225.08799743652344 }, { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 1027.5419921875, + "y": 226.7010040283203 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 1020.7750244140625, + "y": 228.10299682617188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 1013.9660034179688, + "y": 229.29100036621094 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 1010.1790161132812, + "y": 229.8820037841797 + }, + { + "x": 1006.051025390625, + "y": 230.38299560546875 } ], "isCurve": true, @@ -3324,284 +3372,296 @@ "link": "", "route": [ { - "x": 1004.4099731445312, - "y": -186.23399353027344 + "x": 1079.051025390625, + "y": -206.39500427246094 }, { - "x": 1005.052978515625, - "y": -186.1490020751953 + "x": 1080.1240234375, + "y": -206.26499938964844 }, { - "x": 1007.1259765625, - "y": -185.85400390625 + "x": 1082.407958984375, + "y": -205.96400451660156 }, { - "x": 1009.197021484375, - "y": -185.53700256347656 + "x": 1084.68896484375, + "y": -205.63900756835938 }, { - "x": 1011.2630004882812, - "y": -185.19900512695312 + "x": 1086.9659423828125, + "y": -205.29100036621094 }, { - "x": 1013.3270263671875, - "y": -184.83900451660156 + "x": 1089.239990234375, + "y": -204.91900634765625 }, { - "x": 1015.385986328125, - "y": -184.45700073242188 + "x": 1091.509033203125, + "y": -204.5229949951172 }, { - "x": 1017.4409790039062, - "y": -184.0540008544922 + "x": 1093.7750244140625, + "y": -204.10299682617188 }, { - "x": 1019.4920043945312, - "y": -183.62899780273438 + "x": 1096.0350341796875, + "y": -203.65899658203125 }, { - "x": 1021.5380249023438, - "y": -183.18299865722656 + "x": 1098.291015625, + "y": -203.19200134277344 }, { - "x": 1023.5800170898438, - "y": -182.71499633789062 + "x": 1100.5419921875, + "y": -202.7010040283203 }, { - "x": 1025.615966796875, - "y": -182.2259979248047 + "x": 1102.7879638671875, + "y": -202.18699645996094 }, { - "x": 1027.64794921875, - "y": -181.71600341796875 + "x": 1105.0279541015625, + "y": -201.6490020751953 }, { - "x": 1029.6729736328125, - "y": -181.18499755859375 + "x": 1107.261962890625, + "y": -201.08799743652344 }, { - "x": 1031.6939697265625, - "y": -180.6320037841797 + "x": 1109.490966796875, + "y": -200.5030059814453 }, { - "x": 1033.7080078125, - "y": -180.05799865722656 + "x": 1111.7130126953125, + "y": -199.89500427246094 }, { - "x": 1035.7159423828125, - "y": -179.46299743652344 + "x": 1113.928955078125, + "y": -199.26400756835938 }, { - "x": 1037.718017578125, - "y": -178.84800720214844 + "x": 1116.137939453125, + "y": -198.61000061035156 }, { - "x": 1039.7130126953125, - "y": -178.21099853515625 + "x": 1118.3399658203125, + "y": -197.9320068359375 }, { - "x": 1041.7020263671875, - "y": -177.55299377441406 + "x": 1120.5340576171875, + "y": -197.23199462890625 }, { - "x": 1043.6829833984375, - "y": -176.875 + "x": 1122.7220458984375, + "y": -196.50900268554688 }, { - "x": 1045.656982421875, - "y": -176.17599487304688 + "x": 1124.9010009765625, + "y": -195.76199340820312 }, { - "x": 1047.6240234375, - "y": -175.45599365234375 + "x": 1127.072998046875, + "y": -194.9929962158203 }, { - "x": 1049.5830078125, - "y": -174.71600341796875 + "x": 1129.237060546875, + "y": -194.20199584960938 }, { - "x": 1051.5350341796875, - "y": -173.9550018310547 + "x": 1131.3919677734375, + "y": -193.38699340820312 }, { - "x": 1053.47802734375, - "y": -173.1739959716797 + "x": 1133.5379638671875, + "y": -192.5500030517578 }, { - "x": 1055.4129638671875, - "y": -172.3719940185547 + "x": 1135.676025390625, + "y": -191.6909942626953 }, { - "x": 1057.3389892578125, - "y": -171.5500030517578 + "x": 1137.803955078125, + "y": -190.8090057373047 }, { - "x": 1059.2569580078125, - "y": -170.70899963378906 + "x": 1139.9229736328125, + "y": -189.906005859375 }, { - "x": 1061.166015625, - "y": -169.8470001220703 + "x": 1142.032958984375, + "y": -188.97999572753906 }, { - "x": 1063.0660400390625, - "y": -168.96499633789062 + "x": 1144.1319580078125, + "y": -188.031005859375 }, { - "x": 1064.9560546875, - "y": -168.06300354003906 + "x": 1146.2220458984375, + "y": -187.06100463867188 }, { - "x": 1066.8370361328125, - "y": -167.14199829101562 + "x": 1148.302001953125, + "y": -186.07000732421875 }, { - "x": 1068.7080078125, - "y": -166.2010040283203 + "x": 1150.3699951171875, + "y": -185.05599975585938 }, { - "x": 1070.5689697265625, - "y": -165.24000549316406 + "x": 1152.428955078125, + "y": -184.02099609375 }, { - "x": 1072.4200439453125, - "y": -164.25999450683594 + "x": 1154.4759521484375, + "y": -182.96400451660156 }, { - "x": 1074.260009765625, - "y": -163.26100158691406 + "x": 1156.511962890625, + "y": -181.88600158691406 }, { - "x": 1076.0899658203125, - "y": -162.24200439453125 + "x": 1158.5360107421875, + "y": -180.78700256347656 }, { - "x": 1077.9100341796875, - "y": -161.2050018310547 + "x": 1160.550048828125, + "y": -179.66700744628906 }, { - "x": 1079.718017578125, - "y": -160.1479949951172 + "x": 1162.551025390625, + "y": -178.52499389648438 }, { - "x": 1081.5150146484375, - "y": -159.07200622558594 + "x": 1164.5400390625, + "y": -177.36300659179688 }, { - "x": 1083.301025390625, - "y": -157.97799682617188 + "x": 1166.5169677734375, + "y": -176.17999267578125 }, { - "x": 1085.074951171875, - "y": -156.86500549316406 + "x": 1168.48095703125, + "y": -174.9759979248047 }, { - "x": 1086.8370361328125, - "y": -155.73399353027344 + "x": 1170.4329833984375, + "y": -173.7519989013672 }, { - "x": 1088.5880126953125, - "y": -154.58399963378906 + "x": 1172.3709716796875, + "y": -172.5070037841797 }, { - "x": 1090.3260498046875, - "y": -153.41600036621094 + "x": 1174.2969970703125, + "y": -171.24200439453125 }, { - "x": 1092.052001953125, - "y": -152.22900390625 + "x": 1176.208984375, + "y": -169.95700073242188 }, { - "x": 1093.7659912109375, - "y": -151.02499389648438 + "x": 1178.1080322265625, + "y": -168.65199279785156 }, { - "x": 1095.467041015625, - "y": -149.80299377441406 + "x": 1179.9930419921875, + "y": -167.3280029296875 }, { - "x": 1097.155029296875, - "y": -148.56300354003906 + "x": 1181.863037109375, + "y": -165.98300170898438 }, { - "x": 1098.8289794921875, - "y": -147.30499267578125 + "x": 1183.719970703125, + "y": -164.61900329589844 }, { - "x": 1100.490966796875, - "y": -146.031005859375 + "x": 1185.56201171875, + "y": -163.23599243164062 }, { - "x": 1102.1390380859375, - "y": -144.73800659179688 + "x": 1187.3900146484375, + "y": -161.83399963378906 }, { - "x": 1103.7740478515625, - "y": -143.4290008544922 + "x": 1189.2030029296875, + "y": -160.41200256347656 }, { - "x": 1105.39404296875, - "y": -142.1020050048828 + "x": 1191.0009765625, + "y": -158.9720001220703 }, { - "x": 1107.0009765625, - "y": -140.75900268554688 + "x": 1192.7840576171875, + "y": -157.51199340820312 }, { - "x": 1108.593994140625, - "y": -139.3990020751953 + "x": 1194.551025390625, + "y": -156.03500366210938 }, { - "x": 1110.1719970703125, - "y": -138.02200317382812 + "x": 1196.302978515625, + "y": -154.53799438476562 }, { - "x": 1111.7359619140625, - "y": -136.6280059814453 + "x": 1198.0389404296875, + "y": -153.0240020751953 }, { - "x": 1113.2850341796875, - "y": -135.218994140625 + "x": 1199.759033203125, + "y": -151.49099731445312 }, { - "x": 1114.8189697265625, - "y": -133.79299926757812 + "x": 1201.4630126953125, + "y": -149.9409942626953 }, { - "x": 1116.3380126953125, - "y": -132.3520050048828 + "x": 1203.1510009765625, + "y": -148.3730010986328 }, { - "x": 1117.842041015625, - "y": -130.8939971923828 + "x": 1204.822021484375, + "y": -146.78700256347656 }, { - "x": 1119.3310546875, - "y": -129.42100524902344 + "x": 1206.47705078125, + "y": -145.18299865722656 }, { - "x": 1120.803955078125, - "y": -127.93199920654297 + "x": 1208.114013671875, + "y": -143.56300354003906 }, { - "x": 1122.261962890625, - "y": -126.4280014038086 + "x": 1209.7349853515625, + "y": -141.9250030517578 }, { - "x": 1123.7030029296875, - "y": -124.90899658203125 + "x": 1211.3380126953125, + "y": -140.27099609375 }, { - "x": 1125.1290283203125, - "y": -123.375 + "x": 1212.9239501953125, + "y": -138.60000610351562 }, { - "x": 1124.509033203125, - "y": -124.10600280761719 + "x": 1214.491943359375, + "y": -136.91200256347656 }, { - "x": 1127.2750244140625, - "y": -121 + "x": 1216.04296875, + "y": -135.20799255371094 + }, + { + "x": 1217.574951171875, + "y": -133.48800659179688 + }, + { + "x": 1217.029052734375, + "y": -134.16000366210938 + }, + { + "x": 1219.7320556640625, + "y": -131 } ], "isCurve": true, @@ -3636,272 +3696,288 @@ "link": "", "route": [ { - "x": 1166.3509521484375, - "y": -55 + "x": 1258.634033203125, + "y": -65 }, { - "x": 1166.7850341796875, - "y": -53.77299880981445 + "x": 1258.7530517578125, + "y": -64.68499755859375 }, { - "x": 1167.4630126953125, - "y": -51.79100036621094 + "x": 1259.5439453125, + "y": -62.52199935913086 }, { - "x": 1168.1209716796875, - "y": -49.803001403808594 + "x": 1260.31298828125, + "y": -60.349998474121094 }, { - "x": 1168.758056640625, - "y": -47.80799865722656 + "x": 1261.06005859375, + "y": -58.17100143432617 }, { - "x": 1169.3740234375, - "y": -45.805999755859375 + "x": 1261.782958984375, + "y": -55.983001708984375 }, { - "x": 1169.968017578125, - "y": -43.79800033569336 + "x": 1262.4840087890625, + "y": -53.78799819946289 }, { - "x": 1170.5419921875, - "y": -41.78300094604492 + "x": 1263.1610107421875, + "y": -51.58599853515625 }, { - "x": 1171.094970703125, - "y": -39.76300048828125 + "x": 1263.81494140625, + "y": -49.37799835205078 }, { - "x": 1171.6259765625, - "y": -37.73699951171875 + "x": 1264.446044921875, + "y": -47.1619987487793 }, { - "x": 1172.136962890625, - "y": -35.70600128173828 + "x": 1265.053955078125, + "y": -44.939998626708984 }, { - "x": 1172.625, - "y": -33.66999816894531 + "x": 1265.6390380859375, + "y": -42.71099853515625 }, { - "x": 1173.093017578125, - "y": -31.628000259399414 + "x": 1266.199951171875, + "y": -40.47700119018555 }, { - "x": 1173.5389404296875, - "y": -29.582000732421875 + "x": 1266.738037109375, + "y": -38.23699951171875 }, { - "x": 1173.9639892578125, - "y": -27.5310001373291 + "x": 1267.251953125, + "y": -35.99100112915039 }, { - "x": 1174.366943359375, - "y": -25.47599983215332 + "x": 1267.7430419921875, + "y": -33.7400016784668 }, { - "x": 1174.7490234375, - "y": -23.416000366210938 + "x": 1268.2099609375, + "y": -31.483999252319336 }, { - "x": 1175.1090087890625, - "y": -21.35300064086914 + "x": 1268.654052734375, + "y": -29.222999572753906 }, { - "x": 1175.447021484375, - "y": -19.285999298095703 + "x": 1269.073974609375, + "y": -26.95800018310547 }, { - "x": 1175.7640380859375, - "y": -17.215999603271484 + "x": 1269.469970703125, + "y": -24.68899917602539 }, { - "x": 1176.0589599609375, - "y": -15.142999649047852 + "x": 1269.842041015625, + "y": -22.415000915527344 }, { - "x": 1176.3330078125, - "y": -13.065999984741211 + "x": 1270.1910400390625, + "y": -20.13800048828125 }, { - "x": 1176.583984375, - "y": -10.987000465393066 + "x": 1270.5150146484375, + "y": -17.85700035095215 }, { - "x": 1176.81396484375, - "y": -8.904999732971191 + "x": 1270.8160400390625, + "y": -15.572999954223633 }, { - "x": 1177.02197265625, - "y": -6.821000099182129 + "x": 1271.093017578125, + "y": -13.28600025177002 }, { - "x": 1177.2080078125, - "y": -4.735000133514404 + "x": 1271.344970703125, + "y": -10.996000289916992 }, { - "x": 1177.373046875, - "y": -2.6470000743865967 + "x": 1271.573974609375, + "y": -8.70300006866455 }, { - "x": 1177.5150146484375, - "y": -0.5580000281333923 + "x": 1271.779052734375, + "y": -6.408999919891357 }, { - "x": 1177.635986328125, - "y": 1.531999945640564 + "x": 1271.9599609375, + "y": -4.111999988555908 }, { - "x": 1177.7340087890625, - "y": 3.624000072479248 + "x": 1272.116943359375, + "y": -1.812999963760376 }, { - "x": 1177.81103515625, - "y": 5.7170000076293945 + "x": 1272.2490234375, + "y": 0.4860000014305115 }, { - "x": 1177.865966796875, - "y": 7.810999870300293 + "x": 1272.3580322265625, + "y": 2.7869999408721924 }, { - "x": 1177.8990478515625, - "y": 9.904999732971191 + "x": 1272.4420166015625, + "y": 5.089000225067139 }, { - "x": 1177.9100341796875, + "x": 1272.501953125, + "y": 7.392000198364258 + }, + { + "x": 1272.5389404296875, + "y": 9.696000099182129 + }, + { + "x": 1272.551025390625, "y": 11.99899959564209 }, { - "x": 1177.8990478515625, - "y": 14.093999862670898 + "x": 1272.5389404296875, + "y": 14.303000450134277 }, { - "x": 1177.865966796875, - "y": 16.187999725341797 + "x": 1272.501953125, + "y": 16.60700035095215 }, { - "x": 1177.81103515625, - "y": 18.281999588012695 + "x": 1272.4420166015625, + "y": 18.90999984741211 }, { - "x": 1177.7340087890625, - "y": 20.375 + "x": 1272.3580322265625, + "y": 21.211999893188477 }, { - "x": 1177.635986328125, - "y": 22.466999053955078 + "x": 1272.2490234375, + "y": 23.51300048828125 }, { - "x": 1177.5150146484375, - "y": 24.558000564575195 + "x": 1272.116943359375, + "y": 25.812999725341797 }, { - "x": 1177.373046875, - "y": 26.64699935913086 + "x": 1271.9599609375, + "y": 28.11199951171875 }, { - "x": 1177.2080078125, - "y": 28.735000610351562 + "x": 1271.779052734375, + "y": 30.409000396728516 }, { - "x": 1177.02197265625, - "y": 30.820999145507812 + "x": 1271.573974609375, + "y": 32.702999114990234 }, { - "x": 1176.81396484375, - "y": 32.904998779296875 + "x": 1271.344970703125, + "y": 34.99599838256836 }, { - "x": 1176.583984375, - "y": 34.98699951171875 + "x": 1271.093017578125, + "y": 37.2859992980957 }, { - "x": 1176.3330078125, - "y": 37.066001892089844 + "x": 1270.8160400390625, + "y": 39.573001861572266 }, { - "x": 1176.0589599609375, - "y": 39.143001556396484 + "x": 1270.5150146484375, + "y": 41.856998443603516 }, { - "x": 1175.7640380859375, - "y": 41.215999603271484 + "x": 1270.1910400390625, + "y": 44.13800048828125 }, { - "x": 1175.447021484375, - "y": 43.2859992980957 + "x": 1269.842041015625, + "y": 46.415000915527344 }, { - "x": 1175.1090087890625, - "y": 45.35300064086914 + "x": 1269.469970703125, + "y": 48.68899917602539 }, { - "x": 1174.7490234375, - "y": 47.41600036621094 + "x": 1269.073974609375, + "y": 50.95800018310547 }, { - "x": 1174.366943359375, - "y": 49.47600173950195 + "x": 1268.654052734375, + "y": 53.222999572753906 }, { - "x": 1173.9639892578125, - "y": 51.53099822998047 + "x": 1268.2099609375, + "y": 55.48400115966797 }, { - "x": 1173.5389404296875, - "y": 53.582000732421875 + "x": 1267.7430419921875, + "y": 57.7400016784668 }, { - "x": 1173.093017578125, - "y": 55.62799835205078 + "x": 1267.251953125, + "y": 59.99100112915039 }, { - "x": 1172.625, - "y": 57.66999816894531 + "x": 1266.738037109375, + "y": 62.23699951171875 }, { - "x": 1172.136962890625, - "y": 59.70600128173828 + "x": 1266.199951171875, + "y": 64.47699737548828 }, { - "x": 1171.6259765625, - "y": 61.73699951171875 + "x": 1265.6390380859375, + "y": 66.71099853515625 }, { - "x": 1171.094970703125, - "y": 63.76300048828125 + "x": 1265.053955078125, + "y": 68.94000244140625 }, { - "x": 1170.5419921875, - "y": 65.78299713134766 + "x": 1264.446044921875, + "y": 71.16200256347656 }, { - "x": 1169.968017578125, - "y": 67.7979965209961 + "x": 1263.81494140625, + "y": 73.37799835205078 }, { - "x": 1169.3740234375, - "y": 69.80599975585938 + "x": 1263.1610107421875, + "y": 75.58599853515625 }, { - "x": 1168.758056640625, - "y": 71.80799865722656 + "x": 1262.4840087890625, + "y": 77.78800201416016 }, { - "x": 1168.1209716796875, - "y": 73.8030014038086 + "x": 1261.782958984375, + "y": 79.98300170898438 }, { - "x": 1167.4630126953125, - "y": 75.79100036621094 + "x": 1261.06005859375, + "y": 82.1709976196289 }, { - "x": 1167.7440185546875, - "y": 75.08100128173828 + "x": 1260.31298828125, + "y": 84.3499984741211 }, { - "x": 1166.3509521484375, - "y": 78.9990005493164 + "x": 1259.5439453125, + "y": 86.52200317382812 + }, + { + "x": 1260.0899658203125, + "y": 85.10399627685547 + }, + { + "x": 1258.634033203125, + "y": 88.9990005493164 } ], "isCurve": true, @@ -3936,284 +4012,296 @@ "link": "", "route": [ { - "x": 1127.2750244140625, - "y": 144.99899291992188 + "x": 1219.7320556640625, + "y": 154.99899291992188 }, { - "x": 1126.5389404296875, - "y": 145.8260040283203 + "x": 1219.0899658203125, + "y": 155.7519989013672 }, { - "x": 1125.1290283203125, - "y": 147.375 + "x": 1217.574951171875, + "y": 157.48800659179688 }, { - "x": 1123.7030029296875, - "y": 148.90899658203125 + "x": 1216.04296875, + "y": 159.20799255371094 }, { - "x": 1122.261962890625, - "y": 150.42799377441406 + "x": 1214.491943359375, + "y": 160.91200256347656 }, { - "x": 1120.803955078125, - "y": 151.9320068359375 + "x": 1212.9239501953125, + "y": 162.60000610351562 }, { - "x": 1119.3310546875, - "y": 153.42100524902344 + "x": 1211.3380126953125, + "y": 164.27099609375 }, { - "x": 1117.842041015625, - "y": 154.8939971923828 + "x": 1209.7349853515625, + "y": 165.9250030517578 }, { - "x": 1116.3380126953125, - "y": 156.3520050048828 + "x": 1208.114013671875, + "y": 167.56300354003906 }, { - "x": 1114.8189697265625, - "y": 157.79299926757812 + "x": 1206.47705078125, + "y": 169.18299865722656 }, { - "x": 1113.2850341796875, - "y": 159.218994140625 + "x": 1204.822021484375, + "y": 170.78700256347656 }, { - "x": 1111.7359619140625, - "y": 160.6280059814453 + "x": 1203.1510009765625, + "y": 172.3730010986328 }, { - "x": 1110.1719970703125, - "y": 162.02200317382812 + "x": 1201.4630126953125, + "y": 173.9409942626953 }, { - "x": 1108.593994140625, - "y": 163.3990020751953 + "x": 1199.759033203125, + "y": 175.49099731445312 }, { - "x": 1107.0009765625, - "y": 164.75900268554688 + "x": 1198.0389404296875, + "y": 177.0240020751953 }, { - "x": 1105.39404296875, - "y": 166.1020050048828 + "x": 1196.302978515625, + "y": 178.53799438476562 }, { - "x": 1103.7740478515625, - "y": 167.4290008544922 + "x": 1194.551025390625, + "y": 180.03500366210938 }, { - "x": 1102.1390380859375, - "y": 168.73800659179688 + "x": 1192.7840576171875, + "y": 181.51199340820312 }, { - "x": 1100.490966796875, - "y": 170.031005859375 + "x": 1191.0009765625, + "y": 182.9720001220703 }, { - "x": 1098.8289794921875, - "y": 171.30499267578125 + "x": 1189.2030029296875, + "y": 184.41200256347656 }, { - "x": 1097.155029296875, - "y": 172.56300354003906 + "x": 1187.3900146484375, + "y": 185.83399963378906 }, { - "x": 1095.467041015625, - "y": 173.80299377441406 + "x": 1185.56201171875, + "y": 187.23599243164062 }, { - "x": 1093.7659912109375, - "y": 175.02499389648438 + "x": 1183.719970703125, + "y": 188.61900329589844 }, { - "x": 1092.052001953125, - "y": 176.22900390625 + "x": 1181.863037109375, + "y": 189.98300170898438 }, { - "x": 1090.3260498046875, - "y": 177.41600036621094 + "x": 1179.9930419921875, + "y": 191.3280029296875 }, { - "x": 1088.5880126953125, - "y": 178.58399963378906 + "x": 1178.1080322265625, + "y": 192.65199279785156 }, { - "x": 1086.8370361328125, - "y": 179.73399353027344 + "x": 1176.208984375, + "y": 193.95700073242188 }, { - "x": 1085.074951171875, - "y": 180.86500549316406 + "x": 1174.2969970703125, + "y": 195.24200439453125 }, { - "x": 1083.301025390625, - "y": 181.97799682617188 + "x": 1172.3709716796875, + "y": 196.5070037841797 }, { - "x": 1081.5150146484375, - "y": 183.07200622558594 + "x": 1170.4329833984375, + "y": 197.7519989013672 }, { - "x": 1079.718017578125, - "y": 184.1479949951172 + "x": 1168.48095703125, + "y": 198.9759979248047 }, { - "x": 1077.9100341796875, - "y": 185.2050018310547 + "x": 1166.5169677734375, + "y": 200.17999267578125 }, { - "x": 1076.0899658203125, - "y": 186.24200439453125 + "x": 1164.5400390625, + "y": 201.36300659179688 }, { - "x": 1074.260009765625, - "y": 187.26100158691406 + "x": 1162.551025390625, + "y": 202.52499389648438 }, { - "x": 1072.4200439453125, - "y": 188.25999450683594 + "x": 1160.550048828125, + "y": 203.66700744628906 }, { - "x": 1070.5689697265625, - "y": 189.24000549316406 + "x": 1158.5360107421875, + "y": 204.78700256347656 }, { - "x": 1068.7080078125, - "y": 190.2010040283203 + "x": 1156.511962890625, + "y": 205.88600158691406 }, { - "x": 1066.8370361328125, - "y": 191.14199829101562 + "x": 1154.4759521484375, + "y": 206.96400451660156 }, { - "x": 1064.9560546875, - "y": 192.06300354003906 + "x": 1152.428955078125, + "y": 208.02099609375 }, { - "x": 1063.0660400390625, - "y": 192.96499633789062 + "x": 1150.3699951171875, + "y": 209.05599975585938 }, { - "x": 1061.166015625, - "y": 193.8470001220703 + "x": 1148.302001953125, + "y": 210.07000732421875 }, { - "x": 1059.2569580078125, - "y": 194.70899963378906 + "x": 1146.2220458984375, + "y": 211.06100463867188 }, { - "x": 1057.3389892578125, - "y": 195.5500030517578 + "x": 1144.1319580078125, + "y": 212.031005859375 }, { - "x": 1055.4129638671875, - "y": 196.3719940185547 + "x": 1142.032958984375, + "y": 212.97999572753906 }, { - "x": 1053.47802734375, - "y": 197.1739959716797 + "x": 1139.9229736328125, + "y": 213.906005859375 }, { - "x": 1051.5350341796875, - "y": 197.9550018310547 + "x": 1137.803955078125, + "y": 214.8090057373047 }, { - "x": 1049.5830078125, - "y": 198.71600341796875 + "x": 1135.676025390625, + "y": 215.6909942626953 }, { - "x": 1047.6240234375, - "y": 199.45599365234375 + "x": 1133.5379638671875, + "y": 216.5500030517578 }, { - "x": 1045.656982421875, - "y": 200.17599487304688 + "x": 1131.3919677734375, + "y": 217.38699340820312 }, { - "x": 1043.6829833984375, - "y": 200.875 + "x": 1129.237060546875, + "y": 218.20199584960938 }, { - "x": 1041.7020263671875, - "y": 201.55299377441406 + "x": 1127.072998046875, + "y": 218.9929962158203 }, { - "x": 1039.7130126953125, - "y": 202.21099853515625 + "x": 1124.9010009765625, + "y": 219.76199340820312 }, { - "x": 1037.718017578125, - "y": 202.84800720214844 + "x": 1122.7220458984375, + "y": 220.50900268554688 }, { - "x": 1035.7159423828125, - "y": 203.46299743652344 + "x": 1120.5340576171875, + "y": 221.23199462890625 }, { - "x": 1033.7080078125, - "y": 204.05799865722656 + "x": 1118.3399658203125, + "y": 221.9320068359375 }, { - "x": 1031.6939697265625, - "y": 204.6320037841797 + "x": 1116.137939453125, + "y": 222.61000061035156 }, { - "x": 1029.6729736328125, - "y": 205.18499755859375 + "x": 1113.928955078125, + "y": 223.26400756835938 }, { - "x": 1027.64794921875, - "y": 205.71600341796875 + "x": 1111.7130126953125, + "y": 223.89500427246094 }, { - "x": 1025.615966796875, - "y": 206.2259979248047 + "x": 1109.490966796875, + "y": 224.5030059814453 }, { - "x": 1023.5800170898438, - "y": 206.71499633789062 + "x": 1107.261962890625, + "y": 225.08799743652344 }, { - "x": 1021.5380249023438, - "y": 207.18299865722656 + "x": 1105.0279541015625, + "y": 225.6490020751953 }, { - "x": 1019.4920043945312, - "y": 207.62899780273438 + "x": 1102.7879638671875, + "y": 226.18699645996094 }, { - "x": 1017.4409790039062, - "y": 208.0540008544922 + "x": 1100.5419921875, + "y": 226.7010040283203 }, { - "x": 1015.385986328125, - "y": 208.45700073242188 + "x": 1098.291015625, + "y": 227.19200134277344 }, { - "x": 1013.3270263671875, - "y": 208.83900451660156 + "x": 1096.0350341796875, + "y": 227.65899658203125 }, { - "x": 1011.2630004882812, - "y": 209.19900512695312 + "x": 1093.7750244140625, + "y": 228.10299682617188 }, { - "x": 1009.197021484375, - "y": 209.53700256347656 + "x": 1091.509033203125, + "y": 228.5229949951172 }, { - "x": 1007.1259765625, - "y": 209.85400390625 + "x": 1089.239990234375, + "y": 228.91900634765625 }, { - "x": 1009.031005859375, - "y": 209.6060028076172 + "x": 1086.9659423828125, + "y": 229.29100036621094 }, { - "x": 1004.9099731445312, - "y": 210.16799926757812 + "x": 1084.68896484375, + "y": 229.63900756835938 + }, + { + "x": 1082.407958984375, + "y": 229.96400451660156 + }, + { + "x": 1083.677978515625, + "y": 229.82400512695312 + }, + { + "x": 1079.551025390625, + "y": 230.33399963378906 } ], "isCurve": true, @@ -4248,284 +4336,296 @@ "link": "", "route": [ { - "x": 950.9099731445312, - "y": 210.16799926757812 + "x": 1025.551025390625, + "y": 230.33399963378906 }, { - "x": 950.7670288085938, - "y": 210.1490020751953 + "x": 1024.97705078125, + "y": 230.26499938964844 }, { - "x": 948.6929931640625, - "y": 209.85400390625 + "x": 1022.6929931640625, + "y": 229.96400451660156 }, { - "x": 946.6229858398438, - "y": 209.53700256347656 + "x": 1020.4119873046875, + "y": 229.63900756835938 }, { - "x": 944.5560302734375, - "y": 209.19900512695312 + "x": 1018.135009765625, + "y": 229.29100036621094 }, { - "x": 942.4929809570312, - "y": 208.83900451660156 + "x": 1015.8619995117188, + "y": 228.91900634765625 }, { - "x": 940.4329833984375, - "y": 208.45700073242188 + "x": 1013.5919799804688, + "y": 228.5229949951172 }, { - "x": 938.3779907226562, - "y": 208.0540008544922 + "x": 1011.3270263671875, + "y": 228.10299682617188 }, { - "x": 936.3270263671875, - "y": 207.62899780273438 + "x": 1009.0659790039062, + "y": 227.65899658203125 }, { - "x": 934.281005859375, - "y": 207.18299865722656 + "x": 1006.8099975585938, + "y": 227.19200134277344 }, { - "x": 932.239013671875, - "y": 206.71499633789062 + "x": 1004.5590209960938, + "y": 226.7010040283203 }, { - "x": 930.2030029296875, - "y": 206.2259979248047 + "x": 1002.31298828125, + "y": 226.18699645996094 }, { - "x": 928.1719970703125, - "y": 205.71600341796875 + "x": 1000.072998046875, + "y": 225.6490020751953 }, { - "x": 926.14599609375, - "y": 205.18499755859375 + "x": 997.8389892578125, + "y": 225.08799743652344 }, { - "x": 924.1259765625, - "y": 204.6320037841797 + "x": 995.6099853515625, + "y": 224.5030059814453 }, { - "x": 922.1110229492188, - "y": 204.05799865722656 + "x": 993.3880004882812, + "y": 223.89500427246094 }, { - "x": 920.10302734375, - "y": 203.46299743652344 + "x": 991.1729736328125, + "y": 223.26400756835938 }, { - "x": 918.1019897460938, - "y": 202.84800720214844 + "x": 988.9639892578125, + "y": 222.61000061035156 }, { - "x": 916.1060180664062, - "y": 202.21099853515625 + "x": 986.7620239257812, + "y": 221.9320068359375 }, { - "x": 914.1179809570312, - "y": 201.55299377441406 + "x": 984.5670166015625, + "y": 221.23199462890625 }, { - "x": 912.135986328125, - "y": 200.875 + "x": 982.3800048828125, + "y": 220.50900268554688 }, { - "x": 910.1619873046875, - "y": 200.17599487304688 + "x": 980.2000122070312, + "y": 219.76199340820312 }, { - "x": 908.1950073242188, - "y": 199.45599365234375 + "x": 978.0280151367188, + "y": 218.9929962158203 }, { - "x": 906.2360229492188, - "y": 198.71600341796875 + "x": 975.864990234375, + "y": 218.20199584960938 }, { - "x": 904.2849731445312, - "y": 197.9550018310547 + "x": 973.7100219726562, + "y": 217.38699340820312 }, { - "x": 902.3419799804688, - "y": 197.1739959716797 + "x": 971.56298828125, + "y": 216.5500030517578 }, { - "x": 900.406982421875, - "y": 196.3719940185547 + "x": 969.426025390625, + "y": 215.6909942626953 }, { - "x": 898.47998046875, - "y": 195.5500030517578 + "x": 967.2969970703125, + "y": 214.8090057373047 }, { - "x": 896.56201171875, - "y": 194.70899963378906 + "x": 965.177978515625, + "y": 213.906005859375 }, { - "x": 894.6539916992188, - "y": 193.8470001220703 + "x": 963.0689697265625, + "y": 212.97999572753906 }, { - "x": 892.7540283203125, - "y": 192.96499633789062 + "x": 960.968994140625, + "y": 212.031005859375 }, { - "x": 890.8629760742188, - "y": 192.06300354003906 + "x": 958.8790283203125, + "y": 211.06100463867188 }, { - "x": 888.9829711914062, - "y": 191.14199829101562 + "x": 956.7999877929688, + "y": 210.07000732421875 }, { - "x": 887.1119995117188, - "y": 190.2010040283203 + "x": 954.7310180664062, + "y": 209.05599975585938 }, { - "x": 885.25, - "y": 189.24000549316406 + "x": 952.6729736328125, + "y": 208.02099609375 }, { - "x": 883.4000244140625, - "y": 188.25999450683594 + "x": 950.6259765625, + "y": 206.96400451660156 }, { - "x": 881.5590209960938, - "y": 187.26100158691406 + "x": 948.5900268554688, + "y": 205.88600158691406 }, { - "x": 879.72900390625, - "y": 186.24200439453125 + "x": 946.5650024414062, + "y": 204.78700256347656 }, { - "x": 877.9099731445312, - "y": 185.2050018310547 + "x": 944.552001953125, + "y": 203.66700744628906 }, { - "x": 876.1010131835938, - "y": 184.1479949951172 + "x": 942.551025390625, + "y": 202.52499389648438 }, { - "x": 874.3040161132812, - "y": 183.07200622558594 + "x": 940.56201171875, + "y": 201.36300659179688 }, { - "x": 872.5189819335938, - "y": 181.97799682617188 + "x": 938.5850219726562, + "y": 200.17999267578125 }, { - "x": 870.7440185546875, - "y": 180.86500549316406 + "x": 936.6199951171875, + "y": 198.9759979248047 }, { - "x": 868.9819946289062, - "y": 179.73399353027344 + "x": 934.6690063476562, + "y": 197.7519989013672 }, { - "x": 867.2310180664062, - "y": 178.58399963378906 + "x": 932.72998046875, + "y": 196.5070037841797 }, { - "x": 865.4929809570312, - "y": 177.41600036621094 + "x": 930.8049926757812, + "y": 195.24200439453125 }, { - "x": 863.7670288085938, - "y": 176.22900390625 + "x": 928.8920288085938, + "y": 193.95700073242188 }, { - "x": 862.052978515625, - "y": 175.02499389648438 + "x": 926.9940185546875, + "y": 192.65199279785156 }, { - "x": 860.35302734375, - "y": 173.80299377441406 + "x": 925.1090087890625, + "y": 191.3280029296875 }, { - "x": 858.6649780273438, - "y": 172.56300354003906 + "x": 923.2379760742188, + "y": 189.98300170898438 }, { - "x": 856.989990234375, - "y": 171.30499267578125 + "x": 921.3809814453125, + "y": 188.61900329589844 }, { - "x": 855.3280029296875, - "y": 170.031005859375 + "x": 919.5390014648438, + "y": 187.23599243164062 }, { - "x": 853.6799926757812, - "y": 168.73800659179688 + "x": 917.7109985351562, + "y": 185.83399963378906 }, { - "x": 852.0460205078125, - "y": 167.4290008544922 + "x": 915.8980102539062, + "y": 184.41200256347656 }, { - "x": 850.4249877929688, - "y": 166.1020050048828 + "x": 914.0999755859375, + "y": 182.9720001220703 }, { - "x": 848.8179931640625, - "y": 164.75900268554688 + "x": 912.3170166015625, + "y": 181.51199340820312 }, { - "x": 847.2260131835938, - "y": 163.3990020751953 + "x": 910.5499877929688, + "y": 180.03500366210938 }, { - "x": 845.64697265625, - "y": 162.02200317382812 + "x": 908.7979736328125, + "y": 178.53799438476562 }, { - "x": 844.083984375, - "y": 160.6280059814453 + "x": 907.06201171875, + "y": 177.0240020751953 }, { - "x": 842.5339965820312, - "y": 159.218994140625 + "x": 905.3419799804688, + "y": 175.49099731445312 }, { - "x": 841, - "y": 157.79299926757812 + "x": 903.6380004882812, + "y": 173.9409942626953 }, { - "x": 839.4810180664062, - "y": 156.3520050048828 + "x": 901.9500122070312, + "y": 172.3730010986328 }, { - "x": 837.9769897460938, - "y": 154.8939971923828 + "x": 900.2789916992188, + "y": 170.78700256347656 }, { - "x": 836.4879760742188, - "y": 153.42100524902344 + "x": 898.625, + "y": 169.18299865722656 }, { - "x": 835.0150146484375, - "y": 151.9320068359375 + "x": 896.9869995117188, + "y": 167.56300354003906 }, { - "x": 833.5579833984375, - "y": 150.42799377441406 + "x": 895.3670043945312, + "y": 165.9250030517578 }, { - "x": 832.1160278320312, - "y": 148.90899658203125 + "x": 893.7630004882812, + "y": 164.27099609375 }, { - "x": 830.6900024414062, - "y": 147.375 + "x": 892.177978515625, + "y": 162.60000610351562 }, { - "x": 831.3099975585938, - "y": 148.1060028076172 + "x": 890.6090087890625, + "y": 160.91200256347656 }, { - "x": 828.5449829101562, - "y": 145 + "x": 889.0590209960938, + "y": 159.20799255371094 + }, + { + "x": 887.5260009765625, + "y": 157.48800659179688 + }, + { + "x": 888.072021484375, + "y": 158.16000366210938 + }, + { + "x": 885.3690185546875, + "y": 155 } ], "isCurve": true, @@ -4560,272 +4660,288 @@ "link": "", "route": [ { - "x": 789.468994140625, - "y": 79 + "x": 846.4669799804688, + "y": 89 }, { - "x": 789.0339965820312, - "y": 77.77300262451172 + "x": 846.3489990234375, + "y": 88.68499755859375 }, { - "x": 788.3560180664062, - "y": 75.79100036621094 + "x": 845.5570068359375, + "y": 86.52200317382812 }, { - "x": 787.697998046875, - "y": 73.8030014038086 + "x": 844.7880249023438, + "y": 84.3499984741211 }, { - "x": 787.06201171875, - "y": 71.80799865722656 + "x": 844.0419921875, + "y": 82.1709976196289 }, { - "x": 786.4459838867188, - "y": 69.80599975585938 + "x": 843.3179931640625, + "y": 79.98300170898438 }, { - "x": 785.8510131835938, - "y": 67.7979965209961 + "x": 842.6179809570312, + "y": 77.78800201416016 }, { - "x": 785.2769775390625, - "y": 65.78299713134766 + "x": 841.9400024414062, + "y": 75.58599853515625 }, { - "x": 784.7239990234375, - "y": 63.76300048828125 + "x": 841.2860107421875, + "y": 73.37799835205078 }, { - "x": 784.1929931640625, - "y": 61.73699951171875 + "x": 840.655029296875, + "y": 71.16200256347656 }, { - "x": 783.6829833984375, - "y": 59.70600128173828 + "x": 840.0469970703125, + "y": 68.94000244140625 }, { - "x": 783.1939697265625, - "y": 57.66999816894531 + "x": 839.4619750976562, + "y": 66.71099853515625 }, { - "x": 782.7260131835938, - "y": 55.62799835205078 + "x": 838.9010009765625, + "y": 64.47699737548828 }, { - "x": 782.280029296875, - "y": 53.582000732421875 + "x": 838.3629760742188, + "y": 62.23699951171875 }, { - "x": 781.85498046875, - "y": 51.53099822998047 + "x": 837.8489990234375, + "y": 59.99100112915039 }, { - "x": 781.4520263671875, - "y": 49.47600173950195 + "x": 837.3579711914062, + "y": 57.7400016784668 }, { - "x": 781.0709838867188, - "y": 47.41600036621094 + "x": 836.8909912109375, + "y": 55.48400115966797 }, { - "x": 780.7100219726562, - "y": 45.35300064086914 + "x": 836.447021484375, + "y": 53.222999572753906 }, { - "x": 780.3720092773438, - "y": 43.2859992980957 + "x": 836.0280151367188, + "y": 50.95800018310547 }, { - "x": 780.0549926757812, - "y": 41.215999603271484 + "x": 835.6320190429688, + "y": 48.68899917602539 }, { - "x": 779.760009765625, - "y": 39.143001556396484 + "x": 835.2589721679688, + "y": 46.415000915527344 }, { - "x": 779.4869995117188, - "y": 37.066001892089844 + "x": 834.9110107421875, + "y": 44.13800048828125 }, { - "x": 779.2349853515625, - "y": 34.98699951171875 + "x": 834.5859985351562, + "y": 41.856998443603516 }, { - "x": 779.0050048828125, - "y": 32.904998779296875 + "x": 834.2849731445312, + "y": 39.573001861572266 }, { - "x": 778.7969970703125, - "y": 30.820999145507812 + "x": 834.0089721679688, + "y": 37.2859992980957 }, { - "x": 778.6110229492188, - "y": 28.735000610351562 + "x": 833.7559814453125, + "y": 34.99599838256836 }, { - "x": 778.447021484375, - "y": 26.64699935913086 + "x": 833.5269775390625, + "y": 32.702999114990234 }, { - "x": 778.3040161132812, - "y": 24.558000564575195 + "x": 833.322021484375, + "y": 30.409000396728516 }, { - "x": 778.1840209960938, - "y": 22.466999053955078 + "x": 833.1409912109375, + "y": 28.11199951171875 }, { - "x": 778.0850219726562, - "y": 20.375 + "x": 832.9849853515625, + "y": 25.812999725341797 }, { - "x": 778.0079956054688, - "y": 18.281999588012695 + "x": 832.8519897460938, + "y": 23.51300048828125 }, { - "x": 777.9539794921875, - "y": 16.187999725341797 + "x": 832.7440185546875, + "y": 21.211999893188477 }, { - "x": 777.9210205078125, - "y": 14.093999862670898 + "x": 832.6589965820312, + "y": 18.90999984741211 }, { - "x": 777.9099731445312, + "x": 832.5989990234375, + "y": 16.60700035095215 + }, + { + "x": 832.56298828125, + "y": 14.303000450134277 + }, + { + "x": 832.551025390625, "y": 12 }, { - "x": 777.9210205078125, - "y": 9.904999732971191 + "x": 832.56298828125, + "y": 9.696000099182129 }, { - "x": 777.9539794921875, - "y": 7.810999870300293 + "x": 832.5989990234375, + "y": 7.392000198364258 }, { - "x": 778.0079956054688, - "y": 5.7170000076293945 + "x": 832.6589965820312, + "y": 5.089000225067139 }, { - "x": 778.0850219726562, - "y": 3.624000072479248 + "x": 832.7440185546875, + "y": 2.7869999408721924 }, { - "x": 778.1840209960938, - "y": 1.531999945640564 + "x": 832.8519897460938, + "y": 0.4860000014305115 }, { - "x": 778.3040161132812, - "y": -0.5580000281333923 + "x": 832.9849853515625, + "y": -1.812999963760376 }, { - "x": 778.447021484375, - "y": -2.6470000743865967 + "x": 833.1409912109375, + "y": -4.111999988555908 }, { - "x": 778.6110229492188, - "y": -4.735000133514404 + "x": 833.322021484375, + "y": -6.408999919891357 }, { - "x": 778.7969970703125, - "y": -6.821000099182129 + "x": 833.5269775390625, + "y": -8.70300006866455 }, { - "x": 779.0050048828125, - "y": -8.904999732971191 + "x": 833.7559814453125, + "y": -10.996000289916992 }, { - "x": 779.2349853515625, - "y": -10.987000465393066 + "x": 834.0089721679688, + "y": -13.28600025177002 }, { - "x": 779.4869995117188, - "y": -13.065999984741211 + "x": 834.2849731445312, + "y": -15.572999954223633 }, { - "x": 779.760009765625, - "y": -15.142999649047852 + "x": 834.5859985351562, + "y": -17.85700035095215 }, { - "x": 780.0549926757812, - "y": -17.215999603271484 + "x": 834.9110107421875, + "y": -20.13800048828125 }, { - "x": 780.3720092773438, - "y": -19.285999298095703 + "x": 835.2589721679688, + "y": -22.415000915527344 }, { - "x": 780.7100219726562, - "y": -21.35300064086914 + "x": 835.6320190429688, + "y": -24.68899917602539 }, { - "x": 781.0709838867188, - "y": -23.416000366210938 + "x": 836.0280151367188, + "y": -26.95800018310547 }, { - "x": 781.4520263671875, - "y": -25.47599983215332 + "x": 836.447021484375, + "y": -29.222999572753906 }, { - "x": 781.85498046875, - "y": -27.5310001373291 + "x": 836.8909912109375, + "y": -31.483999252319336 }, { - "x": 782.280029296875, - "y": -29.582000732421875 + "x": 837.3579711914062, + "y": -33.7400016784668 }, { - "x": 782.7260131835938, - "y": -31.628000259399414 + "x": 837.8489990234375, + "y": -35.99100112915039 }, { - "x": 783.1939697265625, - "y": -33.66999816894531 + "x": 838.3629760742188, + "y": -38.23699951171875 }, { - "x": 783.6829833984375, - "y": -35.70600128173828 + "x": 838.9010009765625, + "y": -40.47700119018555 }, { - "x": 784.1929931640625, - "y": -37.73699951171875 + "x": 839.4619750976562, + "y": -42.71099853515625 }, { - "x": 784.7239990234375, - "y": -39.76300048828125 + "x": 840.0469970703125, + "y": -44.939998626708984 }, { - "x": 785.2769775390625, - "y": -41.78300094604492 + "x": 840.655029296875, + "y": -47.1619987487793 }, { - "x": 785.8510131835938, - "y": -43.79800033569336 + "x": 841.2860107421875, + "y": -49.37799835205078 }, { - "x": 786.4459838867188, - "y": -45.805999755859375 + "x": 841.9400024414062, + "y": -51.58599853515625 }, { - "x": 787.06201171875, - "y": -47.80799865722656 + "x": 842.6179809570312, + "y": -53.78799819946289 }, { - "x": 787.697998046875, - "y": -49.803001403808594 + "x": 843.3179931640625, + "y": -55.983001708984375 }, { - "x": 788.3560180664062, - "y": -51.79100036621094 + "x": 844.0419921875, + "y": -58.17100143432617 }, { - "x": 788.0750122070312, - "y": -51.08100128173828 + "x": 844.7880249023438, + "y": -60.349998474121094 }, { - "x": 789.468994140625, - "y": -55 + "x": 845.5570068359375, + "y": -62.52199935913086 + }, + { + "x": 845.0120239257812, + "y": -61.104000091552734 + }, + { + "x": 846.4669799804688, + "y": -65 } ], "isCurve": true, @@ -4860,312 +4976,324 @@ "link": "", "route": [ { - "x": 1423.8199462890625, - "y": -167.13400268554688 + "x": 1533.10205078125, + "y": -185.38499450683594 }, { - "x": 1424.8780517578125, - "y": -166.9929962158203 + "x": 1534.175048828125, + "y": -185.2570037841797 }, { - "x": 1427.364990234375, - "y": -166.6320037841797 + "x": 1536.916015625, + "y": -184.89300537109375 }, { - "x": 1429.8470458984375, - "y": -166.23800659179688 + "x": 1539.6510009765625, + "y": -184.4949951171875 }, { - "x": 1432.323974609375, - "y": -165.81399536132812 + "x": 1542.3819580078125, + "y": -184.06199645996094 }, { - "x": 1434.7960205078125, - "y": -165.35899353027344 + "x": 1545.1070556640625, + "y": -183.5959930419922 }, { - "x": 1437.261962890625, - "y": -164.8719940185547 + "x": 1547.8260498046875, + "y": -183.09500122070312 }, { - "x": 1439.720947265625, - "y": -164.35499572753906 + "x": 1550.5379638671875, + "y": -182.5590057373047 }, { - "x": 1442.1739501953125, - "y": -163.8070068359375 + "x": 1553.2430419921875, + "y": -181.99000549316406 }, { - "x": 1444.6199951171875, - "y": -163.22799682617188 + "x": 1555.9410400390625, + "y": -181.38699340820312 }, { - "x": 1447.0579833984375, - "y": -162.6179962158203 + "x": 1558.6319580078125, + "y": -180.75 }, { - "x": 1449.488037109375, - "y": -161.97799682617188 + "x": 1561.31396484375, + "y": -180.0800018310547 }, { - "x": 1451.9100341796875, - "y": -161.3070068359375 + "x": 1563.987060546875, + "y": -179.375 }, { - "x": 1454.323974609375, - "y": -160.6060028076172 + "x": 1566.6510009765625, + "y": -178.63699340820312 }, { - "x": 1456.72802734375, - "y": -159.87399291992188 + "x": 1569.3060302734375, + "y": -177.86599731445312 }, { - "x": 1459.123046875, - "y": -159.11300659179688 + "x": 1571.9510498046875, + "y": -177.06199645996094 }, { - "x": 1461.509033203125, - "y": -158.3209991455078 + "x": 1574.5860595703125, + "y": -176.2239990234375 }, { - "x": 1463.884033203125, - "y": -157.49899291992188 + "x": 1577.208984375, + "y": -175.35299682617188 }, { - "x": 1466.248046875, - "y": -156.6479949951172 + "x": 1579.822021484375, + "y": -174.44900512695312 }, { - "x": 1468.60205078125, - "y": -155.76699829101562 + "x": 1582.4229736328125, + "y": -173.51300048828125 }, { - "x": 1470.9449462890625, - "y": -154.8560028076172 + "x": 1585.011962890625, + "y": -172.54400634765625 }, { - "x": 1473.2760009765625, - "y": -153.91700744628906 + "x": 1587.5889892578125, + "y": -171.54200744628906 }, { - "x": 1475.594970703125, - "y": -152.947998046875 + "x": 1590.1529541015625, + "y": -170.50799560546875 }, { - "x": 1477.9010009765625, - "y": -151.94900512695312 + "x": 1592.7039794921875, + "y": -169.44200134277344 }, { - "x": 1480.1949462890625, - "y": -150.9219970703125 + "x": 1595.240966796875, + "y": -168.343994140625 }, { - "x": 1482.4759521484375, - "y": -149.86700439453125 + "x": 1597.7640380859375, + "y": -167.21499633789062 }, { - "x": 1484.7430419921875, - "y": -148.78199768066406 + "x": 1600.27294921875, + "y": -166.05299377441406 }, { - "x": 1486.9959716796875, - "y": -147.66900634765625 + "x": 1602.7669677734375, + "y": -164.86099243164062 }, { - "x": 1489.2359619140625, - "y": -146.5279998779297 + "x": 1605.2459716796875, + "y": -163.63600158691406 }, { - "x": 1491.4610595703125, - "y": -145.35899353027344 + "x": 1607.708984375, + "y": -162.38099670410156 }, { - "x": 1493.6710205078125, - "y": -144.16299438476562 + "x": 1610.156982421875, + "y": -161.09500122070312 }, { - "x": 1495.864990234375, - "y": -142.93800354003906 + "x": 1612.5880126953125, + "y": -159.7790069580078 }, { - "x": 1498.0439453125, - "y": -141.68600463867188 + "x": 1615.001953125, + "y": -158.4320068359375 }, { - "x": 1500.2080078125, - "y": -140.40699768066406 + "x": 1617.3990478515625, + "y": -157.05499267578125 }, { - "x": 1502.35498046875, - "y": -139.10000610351562 + "x": 1619.779052734375, + "y": -155.64700317382812 }, { - "x": 1504.4849853515625, - "y": -137.76699829101562 + "x": 1622.1400146484375, + "y": -154.2100067138672 }, { - "x": 1506.5989990234375, - "y": -136.40699768066406 + "x": 1624.4840087890625, + "y": -152.74400329589844 }, { - "x": 1508.6949462890625, - "y": -135.02000427246094 + "x": 1626.8089599609375, + "y": -151.2480010986328 }, { - "x": 1510.7740478515625, - "y": -133.60800170898438 + "x": 1629.114013671875, + "y": -149.7220001220703 }, { - "x": 1512.833984375, - "y": -132.16900634765625 + "x": 1631.4010009765625, + "y": -148.16900634765625 }, { - "x": 1514.876953125, - "y": -130.7050018310547 + "x": 1633.66796875, + "y": -146.58599853515625 }, { - "x": 1516.9010009765625, - "y": -129.21499633789062 + "x": 1635.9150390625, + "y": -144.97500610351562 }, { - "x": 1518.906005859375, - "y": -127.6989974975586 + "x": 1638.1409912109375, + "y": -143.33599853515625 }, { - "x": 1520.8919677734375, - "y": -126.15899658203125 + "x": 1640.3470458984375, + "y": -141.66900634765625 }, { - "x": 1522.8580322265625, - "y": -124.59400177001953 + "x": 1642.531005859375, + "y": -139.97500610351562 }, { - "x": 1524.8050537109375, - "y": -123.00399780273438 + "x": 1644.6939697265625, + "y": -138.2530059814453 }, { - "x": 1526.73095703125, - "y": -121.38999938964844 + "x": 1646.8349609375, + "y": -136.50399780273438 }, { - "x": 1528.636962890625, - "y": -119.7509994506836 + "x": 1648.9539794921875, + "y": -134.72900390625 }, { - "x": 1530.52197265625, - "y": -118.08899688720703 + "x": 1651.051025390625, + "y": -132.927001953125 }, { - "x": 1532.385986328125, - "y": -116.40399932861328 + "x": 1653.1240234375, + "y": -131.09800720214844 }, { - "x": 1534.22900390625, - "y": -114.69499969482422 + "x": 1655.175048828125, + "y": -129.24400329589844 }, { - "x": 1536.050048828125, - "y": -112.96299743652344 + "x": 1657.2020263671875, + "y": -127.36399841308594 }, { - "x": 1537.8499755859375, - "y": -111.20800018310547 + "x": 1659.2060546875, + "y": -125.45899963378906 }, { - "x": 1539.626953125, - "y": -109.43099975585938 + "x": 1661.18505859375, + "y": -123.52899932861328 }, { - "x": 1541.3819580078125, - "y": -107.63200378417969 + "x": 1663.1400146484375, + "y": -121.5739974975586 }, { - "x": 1543.114013671875, - "y": -105.81099700927734 + "x": 1665.0699462890625, + "y": -119.59500122070312 }, { - "x": 1544.822021484375, - "y": -103.96800231933594 + "x": 1666.9749755859375, + "y": -117.59200286865234 }, { - "x": 1546.508056640625, - "y": -102.10399627685547 + "x": 1668.85498046875, + "y": -115.56500244140625 }, { - "x": 1548.1700439453125, - "y": -100.21800231933594 + "x": 1670.708984375, + "y": -113.51399993896484 }, { - "x": 1549.8079833984375, - "y": -98.31199645996094 + "x": 1672.5369873046875, + "y": -111.44000244140625 }, { - "x": 1551.4219970703125, - "y": -96.38600158691406 + "x": 1674.3389892578125, + "y": -109.34400177001953 }, { - "x": 1553.011962890625, - "y": -94.43900299072266 + "x": 1676.114990234375, + "y": -107.2249984741211 }, { - "x": 1554.5780029296875, - "y": -92.4729995727539 + "x": 1677.864013671875, + "y": -105.08300018310547 }, { - "x": 1556.1180419921875, - "y": -90.48699951171875 + "x": 1679.5849609375, + "y": -102.91999816894531 }, { - "x": 1557.633056640625, - "y": -88.48200225830078 + "x": 1681.280029296875, + "y": -100.73600006103516 }, { - "x": 1559.123046875, - "y": -86.45800018310547 + "x": 1682.947021484375, + "y": -98.52999877929688 }, { - "x": 1560.5880126953125, - "y": -84.41600036621094 + "x": 1684.5860595703125, + "y": -96.30400085449219 }, { - "x": 1562.0260009765625, - "y": -82.3550033569336 + "x": 1686.196044921875, + "y": -94.05699920654297 }, { - "x": 1563.43896484375, - "y": -80.2760009765625 + "x": 1687.779052734375, + "y": -91.79100036621094 }, { - "x": 1564.824951171875, - "y": -78.18000030517578 + "x": 1689.3330078125, + "y": -89.50399780273438 }, { - "x": 1566.18505859375, - "y": -76.06700134277344 + "x": 1690.8580322265625, + "y": -87.197998046875 }, { - "x": 1567.51904296875, - "y": -73.93599700927734 + "x": 1692.35400390625, + "y": -84.87300109863281 }, { - "x": 1568.824951171875, - "y": -71.78900146484375 + "x": 1693.821044921875, + "y": -82.52999877929688 }, { - "x": 1570.10498046875, - "y": -69.6259994506836 + "x": 1695.258056640625, + "y": -80.16799926757812 }, { - "x": 1571.3570556640625, - "y": -67.4469985961914 + "x": 1696.6650390625, + "y": -77.78800201416016 }, { - "x": 1571.447998046875, - "y": -67.36699676513672 + "x": 1698.0419921875, + "y": -75.39099884033203 }, { - "x": 1573.4189453125, - "y": -63.70500183105469 + "x": 1699.3890380859375, + "y": -72.97699737548828 + }, + { + "x": 1700.7060546875, + "y": -70.5459976196289 + }, + { + "x": 1700.14599609375, + "y": -71.66999816894531 + }, + { + "x": 1702.0550537109375, + "y": -67.9749984741211 } ], "isCurve": true, @@ -5200,304 +5328,312 @@ "link": "", "route": [ { - "x": 1595.23095703125, - "y": 2.2939999103546143 + "x": 1723.7989501953125, + "y": -1.975000023841858 }, { - "x": 1595.4119873046875, - "y": 3.5399999618530273 + "x": 1724.10498046875, + "y": -0.04100000113248825 }, { - "x": 1595.7430419921875, - "y": 6.031000137329102 + "x": 1724.5030517578125, + "y": 2.694000005722046 }, { - "x": 1596.0419921875, - "y": 8.527000427246094 + "x": 1724.866943359375, + "y": 5.434000015258789 }, { - "x": 1596.31005859375, - "y": 11.024999618530273 + "x": 1725.196044921875, + "y": 8.178999900817871 }, { - "x": 1596.5469970703125, - "y": 13.527999877929688 + "x": 1725.490966796875, + "y": 10.928000450134277 }, { - "x": 1596.751953125, - "y": 16.031999588012695 + "x": 1725.7509765625, + "y": 13.680000305175781 }, { - "x": 1596.925048828125, - "y": 18.540000915527344 + "x": 1725.97705078125, + "y": 16.43600082397461 }, { - "x": 1597.0670166015625, - "y": 21.048999786376953 + "x": 1726.16796875, + "y": 19.194000244140625 }, { - "x": 1597.177978515625, - "y": 23.559999465942383 + "x": 1726.323974609375, + "y": 21.95400047302246 }, { - "x": 1597.2569580078125, - "y": 26.07200050354004 + "x": 1726.446044921875, + "y": 24.715999603271484 }, { - "x": 1597.303955078125, - "y": 28.584999084472656 + "x": 1726.531982421875, + "y": 27.479000091552734 }, { - "x": 1597.3199462890625, - "y": 31.097999572753906 + "x": 1726.583984375, + "y": 30.243000030517578 }, { - "x": 1597.303955078125, - "y": 33.611000061035156 + "x": 1726.60205078125, + "y": 33.007999420166016 }, { - "x": 1597.2569580078125, - "y": 36.124000549316406 + "x": 1726.583984375, + "y": 35.77199935913086 }, { - "x": 1597.177978515625, - "y": 38.63600158691406 + "x": 1726.531982421875, + "y": 38.5359992980957 }, { - "x": 1597.0670166015625, - "y": 41.14699935913086 + "x": 1726.446044921875, + "y": 41.29899978637695 }, { - "x": 1596.925048828125, - "y": 43.65599822998047 + "x": 1726.323974609375, + "y": 44.06100082397461 }, { - "x": 1596.751953125, - "y": 46.16299819946289 + "x": 1726.16796875, + "y": 46.821998596191406 }, { - "x": 1596.5469970703125, - "y": 48.667999267578125 + "x": 1725.97705078125, + "y": 49.58000183105469 }, { - "x": 1596.31005859375, - "y": 51.16999816894531 + "x": 1725.7509765625, + "y": 52.334999084472656 }, { - "x": 1596.0419921875, - "y": 53.66899871826172 + "x": 1725.490966796875, + "y": 55.08700180053711 }, { - "x": 1595.7430419921875, - "y": 56.16400146484375 + "x": 1725.196044921875, + "y": 57.83599853515625 }, { - "x": 1595.4119873046875, - "y": 58.65599822998047 + "x": 1724.866943359375, + "y": 60.58100128173828 }, { - "x": 1595.050048828125, - "y": 61.143001556396484 + "x": 1724.5030517578125, + "y": 63.32099914550781 }, { - "x": 1594.656982421875, - "y": 63.625 + "x": 1724.10498046875, + "y": 66.05699920654297 }, { - "x": 1594.2330322265625, - "y": 66.10199737548828 + "x": 1723.6729736328125, + "y": 68.78800201416016 }, { - "x": 1593.7769775390625, - "y": 68.5739974975586 + "x": 1723.2060546875, + "y": 71.51300048828125 }, { - "x": 1593.291015625, - "y": 71.04000091552734 + "x": 1722.7049560546875, + "y": 74.23200225830078 }, { - "x": 1592.77294921875, - "y": 73.4990005493164 + "x": 1722.1700439453125, + "y": 76.94400024414062 }, { - "x": 1592.2249755859375, - "y": 75.9520034790039 + "x": 1721.6009521484375, + "y": 79.64900207519531 }, { - "x": 1591.64599609375, - "y": 78.39800262451172 + "x": 1720.998046875, + "y": 82.34700012207031 }, { - "x": 1591.0360107421875, - "y": 80.83599853515625 + "x": 1720.3609619140625, + "y": 85.03700256347656 }, { - "x": 1590.39599609375, - "y": 83.26599884033203 + "x": 1719.68994140625, + "y": 87.71900177001953 }, { - "x": 1589.7249755859375, - "y": 85.68800354003906 + "x": 1718.9859619140625, + "y": 90.39299774169922 }, { - "x": 1589.0240478515625, - "y": 88.10199737548828 + "x": 1718.248046875, + "y": 93.05699920654297 }, { - "x": 1588.29296875, - "y": 90.50599670410156 + "x": 1717.47705078125, + "y": 95.71199798583984 }, { - "x": 1587.531005859375, - "y": 92.9010009765625 + "x": 1716.6719970703125, + "y": 98.35700225830078 }, { - "x": 1586.739013671875, - "y": 95.28700256347656 + "x": 1715.833984375, + "y": 100.99099731445312 }, { - "x": 1585.91796875, - "y": 97.66200256347656 + "x": 1714.9630126953125, + "y": 103.61499786376953 }, { - "x": 1585.0670166015625, - "y": 100.0260009765625 + "x": 1714.06005859375, + "y": 106.22799682617188 }, { - "x": 1584.18603515625, - "y": 102.37999725341797 + "x": 1713.123046875, + "y": 108.8290023803711 }, { - "x": 1583.2750244140625, - "y": 104.7229995727539 + "x": 1712.154052734375, + "y": 111.41799926757812 }, { - "x": 1582.3349609375, - "y": 107.05400085449219 + "x": 1711.1529541015625, + "y": 113.99500274658203 }, { - "x": 1581.365966796875, - "y": 109.37300109863281 + "x": 1710.1190185546875, + "y": 116.55899810791016 }, { - "x": 1580.3680419921875, - "y": 111.67900085449219 + "x": 1709.052978515625, + "y": 119.11000061035156 }, { - "x": 1579.3409423828125, - "y": 113.9729995727539 + "x": 1707.9549560546875, + "y": 121.64700317382812 }, { - "x": 1578.2850341796875, - "y": 116.25399780273438 + "x": 1706.824951171875, + "y": 124.16999816894531 }, { - "x": 1577.2010498046875, - "y": 118.52100372314453 + "x": 1705.6639404296875, + "y": 126.67900085449219 }, { - "x": 1576.0880126953125, - "y": 120.77400207519531 + "x": 1704.470947265625, + "y": 129.17300415039062 }, { - "x": 1574.947021484375, - "y": 123.01399993896484 + "x": 1703.2469482421875, + "y": 131.65199279785156 }, { - "x": 1573.7779541015625, - "y": 125.23899841308594 + "x": 1701.991943359375, + "y": 134.11500549316406 }, { - "x": 1572.5810546875, - "y": 127.4489974975586 + "x": 1700.7060546875, + "y": 136.56199645996094 }, { - "x": 1571.3570556640625, - "y": 129.64300537109375 + "x": 1699.3890380859375, + "y": 138.9929962158203 }, { - "x": 1570.10498046875, - "y": 131.82200622558594 + "x": 1698.0419921875, + "y": 141.4080047607422 }, { - "x": 1568.824951171875, - "y": 133.98599243164062 + "x": 1696.6650390625, + "y": 143.80499267578125 }, { - "x": 1567.51904296875, - "y": 136.13299560546875 + "x": 1695.258056640625, + "y": 146.1840057373047 }, { - "x": 1566.18505859375, - "y": 138.26300048828125 + "x": 1693.821044921875, + "y": 148.54600524902344 }, { - "x": 1564.824951171875, - "y": 140.3769989013672 + "x": 1692.35400390625, + "y": 150.88999938964844 }, { - "x": 1563.43896484375, - "y": 142.47300720214844 + "x": 1690.8580322265625, + "y": 153.21400451660156 }, { - "x": 1562.0260009765625, - "y": 144.552001953125 + "x": 1689.3330078125, + "y": 155.52000427246094 }, { - "x": 1560.5880126953125, - "y": 146.61199951171875 + "x": 1687.779052734375, + "y": 157.8070068359375 }, { - "x": 1559.123046875, - "y": 148.65499877929688 + "x": 1686.196044921875, + "y": 160.07400512695312 }, { - "x": 1557.633056640625, - "y": 150.6790008544922 + "x": 1684.5860595703125, + "y": 162.32000732421875 }, { - "x": 1556.1180419921875, - "y": 152.6840057373047 + "x": 1682.947021484375, + "y": 164.5469970703125 }, { - "x": 1554.5780029296875, - "y": 154.6699981689453 + "x": 1681.280029296875, + "y": 166.7519989013672 }, { - "x": 1553.011962890625, - "y": 156.63600158691406 + "x": 1679.5849609375, + "y": 168.93699645996094 }, { - "x": 1551.4219970703125, - "y": 158.58299255371094 + "x": 1677.864013671875, + "y": 171.10000610351562 }, { - "x": 1549.8079833984375, - "y": 160.50900268554688 + "x": 1676.114990234375, + "y": 173.24099731445312 }, { - "x": 1548.1700439453125, - "y": 162.4149932861328 + "x": 1674.3389892578125, + "y": 175.36000061035156 }, { - "x": 1546.508056640625, - "y": 164.3000030517578 + "x": 1672.5369873046875, + "y": 177.45599365234375 }, { - "x": 1544.822021484375, - "y": 166.16400146484375 + "x": 1670.708984375, + "y": 179.52999877929688 }, { - "x": 1543.114013671875, - "y": 168.0070037841797 + "x": 1668.85498046875, + "y": 181.58099365234375 }, { - "x": 1544.261962890625, - "y": 166.83799743652344 + "x": 1666.9749755859375, + "y": 183.60800170898438 }, { - "x": 1541.376953125, - "y": 169.83299255371094 + "x": 1665.0699462890625, + "y": 185.61099243164062 + }, + { + "x": 1665.3509521484375, + "y": 185.3699951171875 + }, + { + "x": 1662.4150390625, + "y": 188.3159942626953 } ], "isCurve": true, @@ -5532,312 +5668,320 @@ "link": "", "route": [ { - "x": 1488.376953125, - "y": 209.16299438476562 + "x": 1609.4150390625, + "y": 227.5019989013672 }, { - "x": 1486.9959716796875, - "y": 209.86599731445312 + "x": 1607.708984375, + "y": 228.3979949951172 }, { - "x": 1484.7430419921875, - "y": 210.97900390625 + "x": 1605.2459716796875, + "y": 229.6529998779297 }, { - "x": 1482.4759521484375, - "y": 212.06300354003906 + "x": 1602.7669677734375, + "y": 230.8769989013672 }, { - "x": 1480.1949462890625, - "y": 213.11900329589844 + "x": 1600.27294921875, + "y": 232.07000732421875 }, { - "x": 1477.9010009765625, - "y": 214.14599609375 + "x": 1597.7640380859375, + "y": 233.2310028076172 }, { - "x": 1475.594970703125, - "y": 215.1439971923828 + "x": 1595.240966796875, + "y": 234.36099243164062 }, { - "x": 1473.2760009765625, - "y": 216.11300659179688 + "x": 1592.7039794921875, + "y": 235.45899963378906 }, { - "x": 1470.9449462890625, - "y": 217.05299377441406 + "x": 1590.1529541015625, + "y": 236.52499389648438 }, { - "x": 1468.60205078125, - "y": 217.96400451660156 + "x": 1587.5889892578125, + "y": 237.55799865722656 }, { - "x": 1466.248046875, - "y": 218.84500122070312 + "x": 1585.011962890625, + "y": 238.55999755859375 }, { - "x": 1463.884033203125, - "y": 219.6959991455078 + "x": 1582.4229736328125, + "y": 239.5290069580078 }, { - "x": 1461.509033203125, - "y": 220.51699829101562 + "x": 1579.822021484375, + "y": 240.46600341796875 }, { - "x": 1459.123046875, - "y": 221.3090057373047 + "x": 1577.208984375, + "y": 241.36900329589844 }, { - "x": 1456.72802734375, - "y": 222.0709991455078 + "x": 1574.5860595703125, + "y": 242.24000549316406 }, { - "x": 1454.323974609375, - "y": 222.802001953125 + "x": 1571.9510498046875, + "y": 243.0780029296875 }, { - "x": 1451.9100341796875, - "y": 223.5030059814453 + "x": 1569.3060302734375, + "y": 243.8820037841797 }, { - "x": 1449.488037109375, - "y": 224.1739959716797 + "x": 1566.6510009765625, + "y": 244.6540069580078 }, { - "x": 1447.0579833984375, - "y": 224.81399536132812 + "x": 1563.987060546875, + "y": 245.39199829101562 }, { - "x": 1444.6199951171875, - "y": 225.4239959716797 + "x": 1561.31396484375, + "y": 246.0959930419922 }, { - "x": 1442.1739501953125, - "y": 226.0030059814453 + "x": 1558.6319580078125, + "y": 246.76699829101562 }, { - "x": 1439.720947265625, - "y": 226.55099487304688 + "x": 1555.9410400390625, + "y": 247.4040069580078 }, { - "x": 1437.261962890625, - "y": 227.06900024414062 + "x": 1553.2430419921875, + "y": 248.0070037841797 }, { - "x": 1434.7960205078125, - "y": 227.55499267578125 + "x": 1550.5379638671875, + "y": 248.5760040283203 }, { - "x": 1432.323974609375, - "y": 228.01100158691406 + "x": 1547.8260498046875, + "y": 249.11099243164062 }, { - "x": 1429.8470458984375, - "y": 228.43499755859375 + "x": 1545.1070556640625, + "y": 249.61199951171875 }, { - "x": 1427.364990234375, - "y": 228.8280029296875 + "x": 1542.3819580078125, + "y": 250.07899475097656 }, { - "x": 1424.8780517578125, - "y": 229.19000244140625 + "x": 1539.6510009765625, + "y": 250.51100158691406 }, { - "x": 1422.385986328125, - "y": 229.52099609375 + "x": 1536.916015625, + "y": 250.90899658203125 }, { - "x": 1419.8909912109375, - "y": 229.82000732421875 + "x": 1534.175048828125, + "y": 251.2729949951172 }, { - "x": 1417.3919677734375, - "y": 230.08799743652344 + "x": 1531.4300537109375, + "y": 251.6020050048828 }, { - "x": 1414.8900146484375, - "y": 230.3249969482422 + "x": 1528.6810302734375, + "y": 251.89700317382812 }, { - "x": 1412.385009765625, - "y": 230.52999877929688 + "x": 1525.928955078125, + "y": 252.15699768066406 }, { - "x": 1409.8780517578125, - "y": 230.7030029296875 + "x": 1523.1739501953125, + "y": 252.38299560546875 }, { - "x": 1407.3690185546875, - "y": 230.84500122070312 + "x": 1520.416015625, + "y": 252.57400512695312 }, { - "x": 1404.8580322265625, - "y": 230.95599365234375 + "x": 1517.656005859375, + "y": 252.72999572753906 }, { - "x": 1402.345947265625, - "y": 231.03500366210938 + "x": 1514.89404296875, + "y": 252.8509979248047 }, { - "x": 1399.8330078125, - "y": 231.08200073242188 + "x": 1512.1300048828125, + "y": 252.93800354003906 }, { - "x": 1397.3199462890625, - "y": 231.09800720214844 + "x": 1509.365966796875, + "y": 252.99000549316406 }, { - "x": 1394.8070068359375, - "y": 231.08200073242188 + "x": 1506.60205078125, + "y": 253.00799560546875 }, { - "x": 1392.2939453125, - "y": 231.03500366210938 + "x": 1503.8370361328125, + "y": 252.99000549316406 }, { - "x": 1389.781982421875, - "y": 230.95599365234375 + "x": 1501.072998046875, + "y": 252.93800354003906 }, { - "x": 1387.27099609375, - "y": 230.84500122070312 + "x": 1498.31005859375, + "y": 252.8509979248047 }, { - "x": 1384.761962890625, - "y": 230.7030029296875 + "x": 1495.5479736328125, + "y": 252.72999572753906 }, { - "x": 1382.2540283203125, - "y": 230.52999877929688 + "x": 1492.7879638671875, + "y": 252.57400512695312 }, { - "x": 1379.75, - "y": 230.3249969482422 + "x": 1490.030029296875, + "y": 252.38299560546875 }, { - "x": 1377.2469482421875, - "y": 230.08799743652344 + "x": 1487.2750244140625, + "y": 252.15699768066406 }, { - "x": 1374.7490234375, - "y": 229.82000732421875 + "x": 1484.52197265625, + "y": 251.89700317382812 }, { - "x": 1372.2530517578125, - "y": 229.52099609375 + "x": 1481.77294921875, + "y": 251.6020050048828 }, { - "x": 1369.761962890625, - "y": 229.19000244140625 + "x": 1479.029052734375, + "y": 251.2729949951172 }, { - "x": 1367.2750244140625, - "y": 228.8280029296875 + "x": 1476.2879638671875, + "y": 250.90899658203125 }, { - "x": 1364.7919921875, - "y": 228.43499755859375 + "x": 1473.552001953125, + "y": 250.51100158691406 }, { - "x": 1362.31494140625, - "y": 228.01100158691406 + "x": 1470.822021484375, + "y": 250.07899475097656 }, { - "x": 1359.843994140625, - "y": 227.55499267578125 + "x": 1468.0970458984375, + "y": 249.61199951171875 }, { - "x": 1357.3780517578125, - "y": 227.06900024414062 + "x": 1465.3780517578125, + "y": 249.11099243164062 }, { - "x": 1354.91796875, - "y": 226.55099487304688 + "x": 1462.666015625, + "y": 248.5760040283203 }, { - "x": 1352.4659423828125, - "y": 226.0030059814453 + "x": 1459.9599609375, + "y": 248.0070037841797 }, { - "x": 1350.02001953125, - "y": 225.4239959716797 + "x": 1457.261962890625, + "y": 247.4040069580078 }, { - "x": 1347.58203125, - "y": 224.81399536132812 + "x": 1454.572021484375, + "y": 246.76699829101562 }, { - "x": 1345.1519775390625, - "y": 224.1739959716797 + "x": 1451.8900146484375, + "y": 246.0959930419922 }, { - "x": 1342.72900390625, - "y": 223.5030059814453 + "x": 1449.217041015625, + "y": 245.39199829101562 }, { - "x": 1340.3160400390625, - "y": 222.802001953125 + "x": 1446.552001953125, + "y": 244.6540069580078 }, { - "x": 1337.9119873046875, - "y": 222.0709991455078 + "x": 1443.89794921875, + "y": 243.8820037841797 }, { - "x": 1335.5159912109375, - "y": 221.3090057373047 + "x": 1441.2530517578125, + "y": 243.0780029296875 }, { - "x": 1333.1309814453125, - "y": 220.51699829101562 + "x": 1438.6180419921875, + "y": 242.24000549316406 }, { - "x": 1330.7559814453125, - "y": 219.6959991455078 + "x": 1435.9940185546875, + "y": 241.36900329589844 }, { - "x": 1328.3909912109375, - "y": 218.84500122070312 + "x": 1433.3819580078125, + "y": 240.46600341796875 }, { - "x": 1326.0369873046875, - "y": 217.96400451660156 + "x": 1430.780029296875, + "y": 239.5290069580078 }, { - "x": 1323.6949462890625, - "y": 217.05299377441406 + "x": 1428.1910400390625, + "y": 238.55999755859375 }, { - "x": 1321.364013671875, - "y": 216.11300659179688 + "x": 1425.614013671875, + "y": 237.55799865722656 }, { - "x": 1319.0450439453125, - "y": 215.1439971923828 + "x": 1423.050048828125, + "y": 236.52499389648438 }, { - "x": 1316.739013671875, - "y": 214.14599609375 + "x": 1420.5, + "y": 235.45899963378906 }, { - "x": 1314.4449462890625, - "y": 213.11900329589844 + "x": 1417.9620361328125, + "y": 234.36099243164062 }, { - "x": 1312.1639404296875, - "y": 212.06300354003906 + "x": 1415.43896484375, + "y": 233.2310028076172 }, { - "x": 1309.89697265625, - "y": 210.97900390625 + "x": 1412.9300537109375, + "y": 232.07000732421875 }, { - "x": 1310.470947265625, - "y": 211.30099487304688 + "x": 1410.43603515625, + "y": 230.8769989013672 }, { - "x": 1306.762939453125, - "y": 209.41700744628906 + "x": 1407.9580078125, + "y": 229.6529998779297 + }, + { + "x": 1407.970947265625, + "y": 229.69900512695312 + }, + { + "x": 1404.2889404296875, + "y": 227.76400756835938 } ], "isCurve": true, @@ -5872,300 +6016,312 @@ "link": "", "route": [ { - "x": 1252.762939453125, - "y": 169.30799865722656 + "x": 1350.2889404296875, + "y": 187.8159942626953 }, { - "x": 1251.5260009765625, - "y": 168.0070037841797 + "x": 1350.06396484375, + "y": 187.59100341796875 }, { - "x": 1249.8170166015625, - "y": 166.16400146484375 + "x": 1348.134033203125, + "y": 185.61099243164062 }, { - "x": 1248.1319580078125, - "y": 164.3000030517578 + "x": 1346.22900390625, + "y": 183.60800170898438 }, { - "x": 1246.469970703125, - "y": 162.4149932861328 + "x": 1344.3489990234375, + "y": 181.58099365234375 }, { - "x": 1244.8310546875, - "y": 160.50900268554688 + "x": 1342.4949951171875, + "y": 179.52999877929688 }, { - "x": 1243.217041015625, - "y": 158.58299255371094 + "x": 1340.6669921875, + "y": 177.45599365234375 }, { - "x": 1241.626953125, - "y": 156.63600158691406 + "x": 1338.864990234375, + "y": 175.36000061035156 }, { - "x": 1240.06201171875, - "y": 154.6699981689453 + "x": 1337.0889892578125, + "y": 173.24099731445312 }, { - "x": 1238.52197265625, - "y": 152.6840057373047 + "x": 1335.3399658203125, + "y": 171.10000610351562 }, { - "x": 1237.0059814453125, - "y": 150.6790008544922 + "x": 1333.6180419921875, + "y": 168.93699645996094 }, { - "x": 1235.5159912109375, - "y": 148.65499877929688 + "x": 1331.9239501953125, + "y": 166.7519989013672 }, { - "x": 1234.052001953125, - "y": 146.61199951171875 + "x": 1330.2569580078125, + "y": 164.5469970703125 }, { - "x": 1232.613037109375, - "y": 144.552001953125 + "x": 1328.6180419921875, + "y": 162.32000732421875 }, { - "x": 1231.2010498046875, - "y": 142.47300720214844 + "x": 1327.0069580078125, + "y": 160.07400512695312 }, { - "x": 1229.81396484375, - "y": 140.3769989013672 + "x": 1325.425048828125, + "y": 157.8070068359375 }, { - "x": 1228.4539794921875, - "y": 138.26300048828125 + "x": 1323.8709716796875, + "y": 155.52000427246094 }, { - "x": 1227.1209716796875, - "y": 136.13299560546875 + "x": 1322.345947265625, + "y": 153.21400451660156 }, { - "x": 1225.81396484375, - "y": 133.98599243164062 + "x": 1320.8499755859375, + "y": 150.88999938964844 }, { - "x": 1224.5350341796875, - "y": 131.82200622558594 + "x": 1319.383056640625, + "y": 148.54600524902344 }, { - "x": 1223.282958984375, - "y": 129.64300537109375 + "x": 1317.946044921875, + "y": 146.1840057373047 }, { - "x": 1222.0579833984375, - "y": 127.4489974975586 + "x": 1316.5389404296875, + "y": 143.80499267578125 }, { - "x": 1220.862060546875, - "y": 125.23899841308594 + "x": 1315.1610107421875, + "y": 141.4080047607422 }, { - "x": 1219.6929931640625, - "y": 123.01399993896484 + "x": 1313.81396484375, + "y": 138.9929962158203 }, { - "x": 1218.552001953125, - "y": 120.77400207519531 + "x": 1312.498046875, + "y": 136.56199645996094 }, { - "x": 1217.43896484375, - "y": 118.52100372314453 + "x": 1311.2120361328125, + "y": 134.11500549316406 }, { - "x": 1216.35400390625, - "y": 116.25399780273438 + "x": 1309.95703125, + "y": 131.65199279785156 }, { - "x": 1215.2989501953125, - "y": 113.9729995727539 + "x": 1308.7330322265625, + "y": 129.17300415039062 }, { - "x": 1214.27197265625, - "y": 111.67900085449219 + "x": 1307.5400390625, + "y": 126.67900085449219 }, { - "x": 1213.27294921875, - "y": 109.37300109863281 + "x": 1306.3790283203125, + "y": 124.16999816894531 }, { - "x": 1212.303955078125, - "y": 107.05400085449219 + "x": 1305.2490234375, + "y": 121.64700317382812 }, { - "x": 1211.364990234375, - "y": 104.7229995727539 + "x": 1304.1510009765625, + "y": 119.11000061035156 }, { - "x": 1210.4539794921875, - "y": 102.37999725341797 + "x": 1303.0849609375, + "y": 116.55899810791016 }, { - "x": 1209.572998046875, - "y": 100.0260009765625 + "x": 1302.051025390625, + "y": 113.99500274658203 }, { - "x": 1208.7220458984375, - "y": 97.66200256347656 + "x": 1301.0489501953125, + "y": 111.41799926757812 }, { - "x": 1207.9000244140625, - "y": 95.28700256347656 + "x": 1300.0799560546875, + "y": 108.8290023803711 }, { - "x": 1207.1090087890625, - "y": 92.9010009765625 + "x": 1299.14404296875, + "y": 106.22799682617188 }, { - "x": 1206.3470458984375, - "y": 90.50599670410156 + "x": 1298.239990234375, + "y": 103.61499786376953 }, { - "x": 1205.614990234375, - "y": 88.10199737548828 + "x": 1297.3690185546875, + "y": 100.99099731445312 }, { - "x": 1204.9139404296875, - "y": 85.68800354003906 + "x": 1296.531982421875, + "y": 98.35700225830078 }, { - "x": 1204.2430419921875, - "y": 83.26599884033203 + "x": 1295.72705078125, + "y": 95.71199798583984 }, { - "x": 1203.60302734375, - "y": 80.83599853515625 + "x": 1294.9560546875, + "y": 93.05699920654297 }, { - "x": 1202.9930419921875, - "y": 78.39800262451172 + "x": 1294.218017578125, + "y": 90.39299774169922 }, { - "x": 1202.4139404296875, - "y": 75.9520034790039 + "x": 1293.5140380859375, + "y": 87.71900177001953 }, { - "x": 1201.865966796875, - "y": 73.4990005493164 + "x": 1292.843017578125, + "y": 85.03700256347656 }, { - "x": 1201.3489990234375, - "y": 71.04000091552734 + "x": 1292.2060546875, + "y": 82.34700012207031 }, { - "x": 1200.862060546875, - "y": 68.5739974975586 + "x": 1291.60302734375, + "y": 79.64900207519531 }, { - "x": 1200.406982421875, - "y": 66.10199737548828 + "x": 1291.0340576171875, + "y": 76.94400024414062 }, { - "x": 1199.9830322265625, - "y": 63.625 + "x": 1290.4990234375, + "y": 74.23200225830078 }, { - "x": 1199.5889892578125, - "y": 61.143001556396484 + "x": 1289.998046875, + "y": 71.51300048828125 }, { - "x": 1199.22802734375, - "y": 58.65599822998047 + "x": 1289.531005859375, + "y": 68.78800201416016 }, { - "x": 1198.89697265625, - "y": 56.16400146484375 + "x": 1289.0980224609375, + "y": 66.05699920654297 }, { - "x": 1198.5980224609375, - "y": 53.66899871826172 + "x": 1288.699951171875, + "y": 63.32099914550781 }, { - "x": 1198.3299560546875, - "y": 51.16999816894531 + "x": 1288.3370361328125, + "y": 60.58100128173828 }, { - "x": 1198.093017578125, - "y": 48.667999267578125 + "x": 1288.0069580078125, + "y": 57.83599853515625 }, { - "x": 1197.887939453125, - "y": 46.16299819946289 + "x": 1287.7130126953125, + "y": 55.08700180053711 }, { - "x": 1197.7139892578125, - "y": 43.65599822998047 + "x": 1287.4520263671875, + "y": 52.334999084472656 }, { - "x": 1197.572021484375, - "y": 41.14699935913086 + "x": 1287.22705078125, + "y": 49.58000183105469 }, { - "x": 1197.4620361328125, - "y": 38.63600158691406 + "x": 1287.0360107421875, + "y": 46.821998596191406 }, { - "x": 1197.383056640625, - "y": 36.124000549316406 + "x": 1286.8800048828125, + "y": 44.06100082397461 }, { - "x": 1197.3360595703125, - "y": 33.611000061035156 + "x": 1286.758056640625, + "y": 41.29899978637695 }, { - "x": 1197.3199462890625, - "y": 31.097999572753906 + "x": 1286.6710205078125, + "y": 38.5359992980957 }, { - "x": 1197.3360595703125, - "y": 28.584999084472656 + "x": 1286.6190185546875, + "y": 35.77199935913086 }, { - "x": 1197.383056640625, - "y": 26.07200050354004 + "x": 1286.60205078125, + "y": 33.007999420166016 }, { - "x": 1197.4620361328125, - "y": 23.559999465942383 + "x": 1286.6190185546875, + "y": 30.243000030517578 }, { - "x": 1197.572021484375, - "y": 21.048999786376953 + "x": 1286.6710205078125, + "y": 27.479000091552734 }, { - "x": 1197.7139892578125, - "y": 18.540000915527344 + "x": 1286.758056640625, + "y": 24.715999603271484 }, { - "x": 1197.887939453125, - "y": 16.031999588012695 + "x": 1286.8800048828125, + "y": 21.95400047302246 }, { - "x": 1198.093017578125, - "y": 13.527999877929688 + "x": 1287.0360107421875, + "y": 19.194000244140625 }, { - "x": 1198.3299560546875, - "y": 11.024999618530273 + "x": 1287.22705078125, + "y": 16.43600082397461 }, { - "x": 1198.5980224609375, - "y": 8.527000427246094 + "x": 1287.4520263671875, + "y": 13.680000305175781 }, { - "x": 1198.89697265625, - "y": 6.031000137329102 + "x": 1287.7130126953125, + "y": 10.928000450134277 }, { - "x": 1198.81005859375, - "y": 6.409999847412109 + "x": 1288.0069580078125, + "y": 8.178999900817871 }, { - "x": 1199.4090576171875, - "y": 2.2939999103546143 + "x": 1288.3370361328125, + "y": 5.434000015258789 + }, + { + "x": 1288.699951171875, + "y": 2.694000005722046 + }, + { + "x": 1288.7430419921875, + "y": 2.130000114440918 + }, + { + "x": 1289.405029296875, + "y": -1.975000023841858 } ], "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 35f09dec2..6cab848fc 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 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-713325804 .fill-N1{fill:#0A0F25;} + .d2-713325804 .fill-N2{fill:#676C7E;} + .d2-713325804 .fill-N3{fill:#9499AB;} + .d2-713325804 .fill-N4{fill:#CFD2DD;} + .d2-713325804 .fill-N5{fill:#DEE1EB;} + .d2-713325804 .fill-N6{fill:#EEF1F8;} + .d2-713325804 .fill-N7{fill:#FFFFFF;} + .d2-713325804 .fill-B1{fill:#0D32B2;} + .d2-713325804 .fill-B2{fill:#0D32B2;} + .d2-713325804 .fill-B3{fill:#E3E9FD;} + .d2-713325804 .fill-B4{fill:#E3E9FD;} + .d2-713325804 .fill-B5{fill:#EDF0FD;} + .d2-713325804 .fill-B6{fill:#F7F8FE;} + .d2-713325804 .fill-AA2{fill:#4A6FF3;} + .d2-713325804 .fill-AA4{fill:#EDF0FD;} + .d2-713325804 .fill-AA5{fill:#F7F8FE;} + .d2-713325804 .fill-AB4{fill:#EDF0FD;} + .d2-713325804 .fill-AB5{fill:#F7F8FE;} + .d2-713325804 .stroke-N1{stroke:#0A0F25;} + .d2-713325804 .stroke-N2{stroke:#676C7E;} + .d2-713325804 .stroke-N3{stroke:#9499AB;} + .d2-713325804 .stroke-N4{stroke:#CFD2DD;} + .d2-713325804 .stroke-N5{stroke:#DEE1EB;} + .d2-713325804 .stroke-N6{stroke:#EEF1F8;} + .d2-713325804 .stroke-N7{stroke:#FFFFFF;} + .d2-713325804 .stroke-B1{stroke:#0D32B2;} + .d2-713325804 .stroke-B2{stroke:#0D32B2;} + .d2-713325804 .stroke-B3{stroke:#E3E9FD;} + .d2-713325804 .stroke-B4{stroke:#E3E9FD;} + .d2-713325804 .stroke-B5{stroke:#EDF0FD;} + .d2-713325804 .stroke-B6{stroke:#F7F8FE;} + .d2-713325804 .stroke-AA2{stroke:#4A6FF3;} + .d2-713325804 .stroke-AA4{stroke:#EDF0FD;} + .d2-713325804 .stroke-AA5{stroke:#F7F8FE;} + .d2-713325804 .stroke-AB4{stroke:#EDF0FD;} + .d2-713325804 .stroke-AB5{stroke:#F7F8FE;} + .d2-713325804 .background-color-N1{background-color:#0A0F25;} + .d2-713325804 .background-color-N2{background-color:#676C7E;} + .d2-713325804 .background-color-N3{background-color:#9499AB;} + .d2-713325804 .background-color-N4{background-color:#CFD2DD;} + .d2-713325804 .background-color-N5{background-color:#DEE1EB;} + .d2-713325804 .background-color-N6{background-color:#EEF1F8;} + .d2-713325804 .background-color-N7{background-color:#FFFFFF;} + .d2-713325804 .background-color-B1{background-color:#0D32B2;} + .d2-713325804 .background-color-B2{background-color:#0D32B2;} + .d2-713325804 .background-color-B3{background-color:#E3E9FD;} + .d2-713325804 .background-color-B4{background-color:#E3E9FD;} + .d2-713325804 .background-color-B5{background-color:#EDF0FD;} + .d2-713325804 .background-color-B6{background-color:#F7F8FE;} + .d2-713325804 .background-color-AA2{background-color:#4A6FF3;} + .d2-713325804 .background-color-AA4{background-color:#EDF0FD;} + .d2-713325804 .background-color-AA5{background-color:#F7F8FE;} + .d2-713325804 .background-color-AB4{background-color:#EDF0FD;} + .d2-713325804 .background-color-AB5{background-color:#F7F8FE;} + .d2-713325804 .color-N1{color:#0A0F25;} + .d2-713325804 .color-N2{color:#676C7E;} + .d2-713325804 .color-N3{color:#9499AB;} + .d2-713325804 .color-N4{color:#CFD2DD;} + .d2-713325804 .color-N5{color:#DEE1EB;} + .d2-713325804 .color-N6{color:#EEF1F8;} + .d2-713325804 .color-N7{color:#FFFFFF;} + .d2-713325804 .color-B1{color:#0D32B2;} + .d2-713325804 .color-B2{color:#0D32B2;} + .d2-713325804 .color-B3{color:#E3E9FD;} + .d2-713325804 .color-B4{color:#E3E9FD;} + .d2-713325804 .color-B5{color:#EDF0FD;} + .d2-713325804 .color-B6{color:#F7F8FE;} + .d2-713325804 .color-AA2{color:#4A6FF3;} + .d2-713325804 .color-AA4{color:#EDF0FD;} + .d2-713325804 .color-AA5{color:#F7F8FE;} + .d2-713325804 .color-AB4{color:#EDF0FD;} + .d2-713325804 .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-713325804);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-713325804);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-713325804);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-713325804);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-713325804);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-713325804);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-713325804);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file