diff --git a/.emptyAllowedSigners b/.emptyAllowedSigners
new file mode 100644
index 000000000..e69de29bb
diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go
index 73f663551..c3354fcae 100644
--- a/d2layouts/d2cycle/layout.go
+++ b/d2layouts/d2cycle/layout.go
@@ -2,6 +2,7 @@ package d2cycle
import (
"context"
+ "fmt"
"math"
"sort"
@@ -12,10 +13,13 @@ import (
)
const (
- MIN_RADIUS = 200
- PADDING = 20
- MIN_SEGMENT_LEN = 10
- ARC_STEPS = 100
+ MIN_RADIUS = 250 // Increased to provide more space
+ PADDING = 40 // Increased padding between objects
+ MIN_SEGMENT_LEN = 15 // Increased minimum segment length
+ ARC_STEPS = 100 // Keep the same number of steps for arc calculation
+ LABEL_MARGIN = 10 // Margin for labels
+ EDGE_BEND_FACTOR = 0.3 // Controls how much edges bend inward/outward
+ EDGE_PADDING_FACTOR = 0.15 // Controls spacing between parallel edges
)
// Layout lays out the graph and computes curved edge routes
@@ -25,118 +29,319 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e
return nil
}
+ // Pre-compute dimensions for all objects
for _, obj := range g.Objects {
positionLabelsIcons(obj)
}
- radius := calculateRadius(objects)
+ // Calculate optimal radius based on number and size of objects
+ radius := calculateOptimalRadius(objects)
+
+ // Position objects in a circle
positionObjects(objects, radius)
+
+ // Adjust positions to resolve overlaps
+ resolveOverlaps(objects, radius)
- for _, edge := range g.Edges {
- createCircularArc(edge)
- }
+ // Create edge routes for all edges
+ createEdgeRoutes(g.Edges, objects, radius)
return nil
}
-func calculateRadius(objects []*d2graph.Object) float64 {
+// calculateOptimalRadius computes an ideal radius based on number and size of objects
+func calculateOptimalRadius(objects []*d2graph.Object) float64 {
numObjects := float64(len(objects))
+
+ // Find largest object dimension
maxSize := 0.0
+ totalArea := 0.0
for _, obj := range objects {
size := math.Max(obj.Box.Width, obj.Box.Height)
maxSize = math.Max(maxSize, size)
+ totalArea += obj.Box.Width * obj.Box.Height
}
- minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects)
- return math.Max(minRadius, MIN_RADIUS)
+
+ // Minimum radius based on largest object
+ minRadiusBySize := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects)
+
+ // Alternative calculation based on total area
+ areaRadius := math.Sqrt(totalArea / (math.Pi * 0.5)) * 1.5
+
+ // Use the larger of the minimum values
+ calculatedRadius := math.Max(minRadiusBySize, areaRadius)
+
+ // Ensure we don't go below minimum radius
+ return math.Max(calculatedRadius, MIN_RADIUS)
}
+// positionObjects arranges objects in a circle with the given radius
func positionObjects(objects []*d2graph.Object, radius float64) {
numObjects := float64(len(objects))
+
+ // Start from top (-π/2) with equal spacing
angleOffset := -math.Pi / 2
+ // Special case for small number of objects
+ if numObjects <= 3 {
+ // For 2-3 objects, increase spacing
+ angleOffset = -math.Pi / 2
+ radius *= 1.2
+ }
+
for i, obj := range objects {
angle := angleOffset + (2 * math.Pi * float64(i) / numObjects)
x := radius * math.Cos(angle)
y := radius * math.Sin(angle)
obj.TopLeft = geo.NewPoint(
- x-obj.Box.Width/2,
- y-obj.Box.Height/2,
+ x - obj.Box.Width/2,
+ y - obj.Box.Height/2,
)
}
}
-func createCircularArc(edge *d2graph.Edge) {
+// resolveOverlaps detects and fixes overlapping objects
+func resolveOverlaps(objects []*d2graph.Object, radius float64) {
+ if len(objects) <= 1 {
+ return
+ }
+
+ // Maximum number of iterations to prevent infinite loops
+ maxIterations := 10
+ iteration := 0
+
+ for iteration < maxIterations {
+ overlapsResolved := true
+
+ // Check each pair of objects for overlap
+ for i := 0; i < len(objects); i++ {
+ for j := i + 1; j < len(objects); j++ {
+ obj1 := objects[i]
+ obj2 := objects[j]
+
+ // Calculate box centers
+ center1 := obj1.Center()
+ center2 := obj2.Center()
+
+ // Calculate minimum separation needed
+ minSepX := (obj1.Box.Width + obj2.Box.Width) / 2 + PADDING
+ minSepY := (obj1.Box.Height + obj2.Box.Height) / 2 + PADDING
+
+ // Calculate actual separation
+ dx := math.Abs(center2.X - center1.X)
+ dy := math.Abs(center2.Y - center1.Y)
+
+ // Check for overlap
+ if dx < minSepX && dy < minSepY {
+ overlapsResolved = false
+
+ // Calculate push direction (from center to objects)
+ angle1 := math.Atan2(center1.Y, center1.X)
+ angle2 := math.Atan2(center2.Y, center2.X)
+
+ // Push objects outward slightly
+ pushFactor := 0.1 * radius
+
+ // Update first object position
+ newX1 := pushFactor * math.Cos(angle1)
+ newY1 := pushFactor * math.Sin(angle1)
+ obj1.TopLeft.X += newX1 - obj1.Box.Width/2
+ obj1.TopLeft.Y += newY1 - obj1.Box.Height/2
+
+ // Update second object position
+ newX2 := pushFactor * math.Cos(angle2)
+ newY2 := pushFactor * math.Sin(angle2)
+ obj2.TopLeft.X += newX2 - obj2.Box.Width/2
+ obj2.TopLeft.Y += newY2 - obj2.Box.Height/2
+ }
+ }
+ }
+
+ // If no overlaps were found, we're done
+ if overlapsResolved {
+ break
+ }
+
+ iteration++
+ }
+}
+
+// createEdgeRoutes creates routes for all edges in the graph
+func createEdgeRoutes(edges []*d2graph.Edge, objects []*d2graph.Object, radius float64) {
+ // First categorize edges to identify parallel edges
+ edgeGroups := groupParallelEdges(edges)
+
+ // Process each group of edges
+ for _, group := range edgeGroups {
+ if len(group) == 1 {
+ // Single edge
+ createCircularArc(group[0], radius, 0)
+ } else {
+ // Multiple parallel edges
+ for i, edge := range group {
+ // Alternate between inner and outer curves for parallel edges
+ offset := float64(i-(len(group)-1)/2) * EDGE_PADDING_FACTOR
+ createCircularArc(edge, radius, offset)
+ }
+ }
+ }
+}
+
+// groupParallelEdges identifies edges between the same source and destination
+func groupParallelEdges(edges []*d2graph.Edge) [][]*d2graph.Edge {
+ groups := make(map[string][]*d2graph.Edge)
+
+ for _, edge := range edges {
+ if edge.Src == nil || edge.Dst == nil {
+ continue
+ }
+
+ // Create a key for each source-destination pair using object IDs or addresses
+ // Since GetID() is not available, use pointer addresses as unique identifiers
+ srcID := fmt.Sprintf("%p", edge.Src)
+ dstID := fmt.Sprintf("%p", edge.Dst)
+ key := srcID + "->" + dstID
+
+ groups[key] = append(groups[key], edge)
+ }
+
+ // Convert map to slice of edge groups
+ result := make([][]*d2graph.Edge, 0, len(groups))
+ for _, group := range groups {
+ result = append(result, group)
+ }
+
+ return result
+}
+
+// createCircularArc creates a curved path between source and destination objects
+func createCircularArc(edge *d2graph.Edge, baseRadius float64, offset float64) {
if edge.Src == nil || edge.Dst == nil {
return
}
srcCenter := edge.Src.Center()
dstCenter := edge.Dst.Center()
-
+
+ // Calculate angles and radii
srcAngle := math.Atan2(srcCenter.Y, srcCenter.X)
dstAngle := math.Atan2(dstCenter.Y, dstCenter.X)
+
+ // Ensure we go the shorter way around the circle
if dstAngle < srcAngle {
- dstAngle += 2 * math.Pi
+ if srcAngle - dstAngle > math.Pi {
+ dstAngle += 2 * math.Pi
+ }
+ } else {
+ if dstAngle - srcAngle > math.Pi {
+ srcAngle += 2 * math.Pi
+ }
}
-
- arcRadius := math.Hypot(srcCenter.X, srcCenter.Y)
-
+
+ // Adjust radius based on offset for parallel edges
+ arcRadius := baseRadius * (1.0 + offset)
+
+ // Control points for the path
path := make([]*geo.Point, 0, ARC_STEPS+1)
+
+ // Add intermediate points along the arc
for i := 0; i <= ARC_STEPS; i++ {
t := float64(i) / float64(ARC_STEPS)
angle := srcAngle + t*(dstAngle-srcAngle)
- x := arcRadius * math.Cos(angle)
- y := arcRadius * math.Sin(angle)
+
+ // Apply an inward bend for better curves
+ distanceFactor := 1.0 - EDGE_BEND_FACTOR * math.Sin(t * math.Pi)
+ radius := arcRadius * distanceFactor
+
+ x := radius * math.Cos(angle)
+ y := radius * math.Sin(angle)
path = append(path, geo.NewPoint(x, y))
}
+
+ // Ensure endpoints are exactly at source and destination centers
path[0] = srcCenter
path[len(path)-1] = dstCenter
- // Clamp endpoints to the boundaries of the source and destination boxes.
+ // Clamp endpoints to the boundaries of the boxes
_, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0)
_, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1)
path[0] = newSrc
path[len(path)-1] = newDst
- // Trim redundant path points that fall inside node boundaries.
+ // Trim redundant path points
path = trimPathPoints(path, edge.Src.Box)
path = trimPathPoints(path, edge.Dst.Box)
+ // Smoothen the path
+ path = smoothPath(path)
+
+ // Set the final route
edge.Route = path
edge.IsCurve = true
+ // Add arrow direction point for the end
if len(edge.Route) >= 2 {
- lastIndex := len(edge.Route) - 1
- lastPoint := edge.Route[lastIndex]
- secondLastPoint := edge.Route[lastIndex-1]
+ adjustArrowDirection(edge)
+ }
+}
- tangentX := -lastPoint.Y
- tangentY := lastPoint.X
- mag := math.Hypot(tangentX, tangentY)
- if mag > 0 {
- tangentX /= mag
- tangentY /= mag
- }
- const MIN_SEGMENT_LEN = 4.159
+// smoothPath applies path smoothing to reduce sharp angles
+func smoothPath(path []*geo.Point) []*geo.Point {
+ if len(path) <= 3 {
+ return path
+ }
+
+ result := []*geo.Point{path[0]}
+
+ // Use a simple moving average for interior points
+ for i := 1; i < len(path)-1; i++ {
+ prev := path[i-1]
+ curr := path[i]
+ next := path[i+1]
+
+ // Simple weighted average (current point has more weight)
+ avgX := (prev.X + 2*curr.X + next.X) / 4
+ avgY := (prev.Y + 2*curr.Y + next.Y) / 4
+
+ result = append(result, geo.NewPoint(avgX, avgY))
+ }
+
+ result = append(result, path[len(path)-1])
+ return result
+}
- dx := lastPoint.X - secondLastPoint.X
- dy := lastPoint.Y - secondLastPoint.Y
- segLength := math.Hypot(dx, dy)
- if segLength > 0 {
- currentDirX := dx / segLength
- currentDirY := dy / segLength
+// adjustArrowDirection ensures the arrow points in the right direction
+func adjustArrowDirection(edge *d2graph.Edge) {
+ lastIndex := len(edge.Route) - 1
+ lastPoint := edge.Route[lastIndex]
+ secondLastPoint := edge.Route[lastIndex-1]
- // Check if we need to adjust the direction
- if segLength < MIN_SEGMENT_LEN || (currentDirX*tangentX+currentDirY*tangentY) < 0.999 {
- // Create new point along tangent direction
- adjustLength := MIN_SEGMENT_LEN // Now float64
- if segLength >= MIN_SEGMENT_LEN {
- adjustLength = segLength // Both are float64 now
- }
- newSecondLastX := lastPoint.X - tangentX*adjustLength
- newSecondLastY := lastPoint.Y - tangentY*adjustLength
- edge.Route[lastIndex-1] = geo.NewPoint(newSecondLastX, newSecondLastY)
- }
+ // Calculate tangent vector perpendicular to radius (for smooth entry)
+ tangentX := -lastPoint.Y
+ tangentY := lastPoint.X
+ mag := math.Hypot(tangentX, tangentY)
+ if mag > 0 {
+ tangentX /= mag
+ tangentY /= mag
+ }
+
+ // Check current direction
+ dx := lastPoint.X - secondLastPoint.X
+ dy := lastPoint.Y - secondLastPoint.Y
+ segLength := math.Hypot(dx, dy)
+
+ if segLength > 0 {
+ currentDirX := dx / segLength
+ currentDirY := dy / segLength
+
+ // Adjust only if direction needs correction
+ dotProduct := currentDirX*tangentX + currentDirY*tangentY
+ if segLength < MIN_SEGMENT_LEN || dotProduct < 0.9 {
+ // Create new point for smooth arrow entry
+ adjustLength := math.Max(MIN_SEGMENT_LEN, segLength * 0.8)
+ newSecondLastX := lastPoint.X - tangentX*adjustLength
+ newSecondLastY := lastPoint.Y - tangentY*adjustLength
+ edge.Route[lastIndex-1] = geo.NewPoint(newSecondLastX, newSecondLastY)
}
}
}
@@ -282,7 +487,7 @@ func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point {
return trimmed
}
-// boxContains uses strict inequalities so that points exactly on the boundary are considered outside.
+// boxContains checks if a point is inside a box (strictly inside, not on boundary)
func boxContains(b *geo.Box, p *geo.Point) bool {
return p.X > b.TopLeft.X &&
p.X < b.TopLeft.X+b.Width &&
@@ -290,34 +495,47 @@ func boxContains(b *geo.Box, p *geo.Point) bool {
p.Y < b.TopLeft.Y+b.Height
}
+// positionLabelsIcons positions labels and icons with better handling of overlap
func positionLabelsIcons(obj *d2graph.Object) {
+ // Handle icon positioning first
if obj.Icon != nil && obj.IconPosition == nil {
if len(obj.ChildrenArray) > 0 {
+ // For container objects, place icon at top left
obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String())
+
+ // If no label position is set, place label at top right
if obj.LabelPosition == nil {
obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String())
return
}
} else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" {
+ // For structured objects, place icon at top left
obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String())
} else {
+ // For standard objects, center the icon
obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String())
}
}
+ // Now handle label positioning
if obj.HasLabel() && obj.LabelPosition == nil {
if len(obj.ChildrenArray) > 0 {
+ // For container objects, place label at top center
obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String())
} else if obj.HasOutsideBottomLabel() {
+ // For objects with bottom labels, respect that
obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String())
} else if obj.Icon != nil {
+ // If there's an icon, place label at top center
obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String())
} else {
+ // Default positioning in the middle
obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String())
}
- if float64(obj.LabelDimensions.Width) > obj.Width ||
- float64(obj.LabelDimensions.Height) > obj.Height {
+ // If label is too large for the object, move it outside
+ if float64(obj.LabelDimensions.Width) > obj.Width*0.9 ||
+ float64(obj.LabelDimensions.Height) > obj.Height*0.9 {
if len(obj.ChildrenArray) > 0 {
obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String())
} else {
@@ -325,4 +543,4 @@ func positionLabelsIcons(obj *d2graph.Object) {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json
index 83148b1ac..d6a55bd46 100644
--- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json
+++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json
@@ -16,10 +16,10 @@
"type": "cycle",
"pos": {
"x": 0,
- "y": 0
+ "y": 50
},
- "width": 453,
- "height": 466,
+ "width": 553,
+ "height": 566,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -98,8 +98,8 @@
"id": "1.b",
"type": "rectangle",
"pos": {
- "x": 173,
- "y": -33
+ "x": 223,
+ "y": 17
},
"width": 53,
"height": 66,
@@ -141,7 +141,7 @@
"type": "rectangle",
"pos": {
"x": -26,
- "y": 167
+ "y": 267
},
"width": 53,
"height": 66,
@@ -182,8 +182,8 @@
"id": "1.d",
"type": "rectangle",
"pos": {
- "x": -227,
- "y": -32
+ "x": -277,
+ "y": 17
},
"width": 54,
"height": 66,
@@ -224,11 +224,11 @@
"id": "2",
"type": "cycle",
"pos": {
- "x": 513,
- "y": 50
+ "x": 613,
+ "y": 75
},
- "width": 399,
- "height": 366,
+ "width": 572,
+ "height": 516,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -265,8 +265,8 @@
"id": "2.a",
"type": "rectangle",
"pos": {
- "x": 486,
- "y": -183
+ "x": 586,
+ "y": -258
},
"width": 53,
"height": 66,
@@ -307,8 +307,8 @@
"id": "2.b",
"type": "rectangle",
"pos": {
- "x": 659,
- "y": 116
+ "x": 846,
+ "y": 191
},
"width": 53,
"height": 66,
@@ -349,8 +349,8 @@
"id": "2.c",
"type": "rectangle",
"pos": {
- "x": 313,
- "y": 117
+ "x": 326,
+ "y": 192
},
"width": 53,
"height": 66,
@@ -391,11 +391,11 @@
"id": "3",
"type": "cycle",
"pos": {
- "x": 972,
+ "x": 1245,
"y": 0
},
"width": 53,
- "height": 466,
+ "height": 666,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -432,8 +432,8 @@
"id": "3.a",
"type": "rectangle",
"pos": {
- "x": 945,
- "y": -233
+ "x": 1218,
+ "y": -333
},
"width": 53,
"height": 66,
@@ -474,8 +474,8 @@
"id": "3.b",
"type": "rectangle",
"pos": {
- "x": 945,
- "y": 167
+ "x": 1218,
+ "y": 267
},
"width": 53,
"height": 66,
@@ -541,335 +541,343 @@
"route": [
{
"x": 26.5,
- "y": -198.22999572753906
+ "y": -181.53399658203125
},
{
- "x": 28.18000030517578,
- "y": -198.00399780273438
+ "x": 29.191999435424805,
+ "y": -179.34300231933594
},
{
- "x": 31.285999298095703,
- "y": -197.53700256347656
+ "x": 32.257999420166016,
+ "y": -176.7830047607422
},
{
- "x": 34.3849983215332,
- "y": -197.02099609375
+ "x": 35.4640007019043,
+ "y": -174.02499389648438
},
{
- "x": 37.47600173950195,
- "y": -196.45700073242188
+ "x": 38.595001220703125,
+ "y": -171.2449951171875
},
{
- "x": 40.55699920654297,
- "y": -195.843994140625
+ "x": 41.65299987792969,
+ "y": -168.44700622558594
},
{
- "x": 43.62799835205078,
- "y": -195.18299865722656
+ "x": 44.63800048828125,
+ "y": -165.63499450683594
},
{
- "x": 46.68899917602539,
- "y": -194.47300720214844
+ "x": 47.551998138427734,
+ "y": -162.81300354003906
},
{
- "x": 49.73699951171875,
- "y": -193.71600341796875
+ "x": 50.39500045776367,
+ "y": -159.98300170898438
},
{
- "x": 52.77399826049805,
- "y": -192.91099548339844
+ "x": 53.16999816894531,
+ "y": -157.1490020751953
},
{
- "x": 55.79800033569336,
- "y": -192.05799865722656
+ "x": 55.87699890136719,
+ "y": -154.31500244140625
},
{
- "x": 58.80799865722656,
- "y": -191.1580047607422
+ "x": 58.52000045776367,
+ "y": -151.48300170898438
},
{
- "x": 61.803001403808594,
- "y": -190.21099853515625
+ "x": 61.0989990234375,
+ "y": -148.65699768066406
},
{
- "x": 64.78299713134766,
- "y": -189.2169952392578
+ "x": 63.61600112915039,
+ "y": -145.83999633789062
},
{
- "x": 67.74700164794922,
- "y": -188.17599487304688
+ "x": 66.07499694824219,
+ "y": -143.03500366210938
},
{
- "x": 70.69400024414062,
- "y": -187.08799743652344
+ "x": 68.47599792480469,
+ "y": -140.2429962158203
},
{
- "x": 73.6240005493164,
- "y": -185.9550018310547
+ "x": 70.822998046875,
+ "y": -137.468994140625
},
{
- "x": 76.53600311279297,
- "y": -184.77499389648438
+ "x": 73.11799621582031,
+ "y": -134.71299743652344
},
{
- "x": 79.42900085449219,
- "y": -183.5500030517578
+ "x": 75.36399841308594,
+ "y": -131.97900390625
},
{
- "x": 82.302001953125,
- "y": -182.27999877929688
+ "x": 77.56199645996094,
+ "y": -129.26800537109375
},
{
- "x": 85.15499877929688,
- "y": -180.96499633789062
+ "x": 79.71700286865234,
+ "y": -126.58300018310547
},
{
- "x": 87.98699951171875,
- "y": -179.60499572753906
+ "x": 81.83000183105469,
+ "y": -123.92500305175781
},
{
- "x": 90.7979965209961,
- "y": -178.2010040283203
+ "x": 83.90399932861328,
+ "y": -121.29499816894531
},
{
- "x": 93.58499908447266,
- "y": -176.7530059814453
+ "x": 85.94200134277344,
+ "y": -118.69599914550781
},
{
- "x": 96.3499984741211,
- "y": -175.26100158691406
+ "x": 87.947998046875,
+ "y": -116.12799835205078
},
{
- "x": 99.09100341796875,
- "y": -173.7259979248047
+ "x": 89.92400360107422,
+ "y": -113.59300231933594
},
{
- "x": 101.80799865722656,
- "y": -172.1479949951172
+ "x": 91.8740005493164,
+ "y": -111.09100341796875
},
{
- "x": 104.4990005493164,
- "y": -170.5279998779297
+ "x": 93.79900360107422,
+ "y": -108.62300109863281
},
{
- "x": 107.16500091552734,
- "y": -168.86500549316406
+ "x": 95.7030029296875,
+ "y": -106.19000244140625
},
{
- "x": 109.80400085449219,
- "y": -167.16099548339844
+ "x": 97.58999633789062,
+ "y": -103.79299926757812
},
{
- "x": 112.41600036621094,
- "y": -165.41600036621094
+ "x": 99.46199798583984,
+ "y": -101.43000030517578
},
{
- "x": 115.0009994506836,
- "y": -163.62899780273438
+ "x": 101.3219985961914,
+ "y": -99.10299682617188
},
{
- "x": 117.55699920654297,
- "y": -161.80299377441406
+ "x": 103.1729965209961,
+ "y": -96.81199645996094
},
{
- "x": 120.08399963378906,
- "y": -159.93600463867188
+ "x": 105.01899719238281,
+ "y": -94.55599975585938
},
{
- "x": 122.58100128173828,
- "y": -158.031005859375
+ "x": 106.86100006103516,
+ "y": -92.33399963378906
},
{
- "x": 125.0479965209961,
- "y": -156.08599853515625
+ "x": 108.7030029296875,
+ "y": -90.14700317382812
},
{
- "x": 127.48400115966797,
- "y": -154.1020050048828
+ "x": 110.5479965209961,
+ "y": -87.99299621582031
},
{
- "x": 129.88900756835938,
- "y": -152.08099365234375
+ "x": 112.39700317382812,
+ "y": -85.87100219726562
},
{
- "x": 132.26199340820312,
- "y": -150.02200317382812
+ "x": 114.25499725341797,
+ "y": -83.77999877929688
},
{
- "x": 134.6020050048828,
- "y": -147.92599487304688
+ "x": 116.12300109863281,
+ "y": -81.72000122070312
},
{
- "x": 136.90899658203125,
- "y": -145.79299926757812
+ "x": 118.00499725341797,
+ "y": -79.68800354003906
},
{
- "x": 139.1820068359375,
- "y": -143.625
+ "x": 119.9010009765625,
+ "y": -77.68299865722656
},
{
- "x": 141.42100524902344,
- "y": -141.42100524902344
+ "x": 121.81500244140625,
+ "y": -75.7040023803711
},
{
- "x": 143.625,
- "y": -139.1820068359375
+ "x": 123.7490005493164,
+ "y": -73.7490005493164
},
{
- "x": 145.79299926757812,
- "y": -136.90899658203125
+ "x": 125.7040023803711,
+ "y": -71.81500244140625
},
{
- "x": 147.92599487304688,
- "y": -134.6020050048828
+ "x": 127.68299865722656,
+ "y": -69.9010009765625
},
{
- "x": 150.02200317382812,
- "y": -132.26199340820312
+ "x": 129.68800354003906,
+ "y": -68.00499725341797
},
{
- "x": 152.08099365234375,
- "y": -129.88900756835938
+ "x": 131.72000122070312,
+ "y": -66.12300109863281
},
{
- "x": 154.1020050048828,
- "y": -127.48400115966797
+ "x": 133.77999877929688,
+ "y": -64.25499725341797
},
{
- "x": 156.08599853515625,
- "y": -125.0479965209961
+ "x": 135.87100219726562,
+ "y": -62.39699935913086
},
{
- "x": 158.031005859375,
- "y": -122.58100128173828
+ "x": 137.9929962158203,
+ "y": -60.54800033569336
},
{
- "x": 159.93600463867188,
- "y": -120.08399963378906
+ "x": 140.14700317382812,
+ "y": -58.702999114990234
},
{
- "x": 161.80299377441406,
- "y": -117.55699920654297
+ "x": 142.33399963378906,
+ "y": -56.861000061035156
},
{
- "x": 163.62899780273438,
- "y": -115.0009994506836
+ "x": 144.55599975585938,
+ "y": -55.01900100708008
},
{
- "x": 165.41600036621094,
- "y": -112.41600036621094
+ "x": 146.81199645996094,
+ "y": -53.17300033569336
},
{
- "x": 167.16099548339844,
- "y": -109.80400085449219
+ "x": 149.10299682617188,
+ "y": -51.321998596191406
},
{
- "x": 168.86500549316406,
- "y": -107.16500091552734
+ "x": 151.42999267578125,
+ "y": -49.46200180053711
},
{
- "x": 170.5279998779297,
- "y": -104.4990005493164
+ "x": 153.79299926757812,
+ "y": -47.59000015258789
},
{
- "x": 172.1479949951172,
- "y": -101.80799865722656
+ "x": 156.19000244140625,
+ "y": -45.702999114990234
},
{
- "x": 173.7259979248047,
- "y": -99.09100341796875
+ "x": 158.6230010986328,
+ "y": -43.79899978637695
},
{
- "x": 175.26100158691406,
- "y": -96.3499984741211
+ "x": 161.09100341796875,
+ "y": -41.874000549316406
},
{
- "x": 176.7530059814453,
- "y": -93.58499908447266
+ "x": 163.59300231933594,
+ "y": -39.92399978637695
},
{
- "x": 178.2010040283203,
- "y": -90.7979965209961
+ "x": 166.1280059814453,
+ "y": -37.948001861572266
},
{
- "x": 179.60499572753906,
- "y": -87.98699951171875
+ "x": 168.6959991455078,
+ "y": -35.94200134277344
},
{
- "x": 180.96499633789062,
- "y": -85.15499877929688
+ "x": 171.2949981689453,
+ "y": -33.90399932861328
},
{
- "x": 182.27999877929688,
- "y": -82.302001953125
+ "x": 173.9250030517578,
+ "y": -31.829999923706055
},
{
- "x": 183.5500030517578,
- "y": -79.42900085449219
+ "x": 176.58299255371094,
+ "y": -29.716999053955078
},
{
- "x": 184.77499389648438,
- "y": -76.53600311279297
+ "x": 179.26800537109375,
+ "y": -27.562000274658203
},
{
- "x": 185.9550018310547,
- "y": -73.6240005493164
+ "x": 181.97900390625,
+ "y": -25.36400032043457
},
{
- "x": 187.08799743652344,
- "y": -70.69400024414062
+ "x": 184.71299743652344,
+ "y": -23.118000030517578
},
{
- "x": 188.17599487304688,
- "y": -67.74700164794922
+ "x": 187.468994140625,
+ "y": -20.822999954223633
},
{
- "x": 189.2169952392578,
- "y": -64.78299713134766
+ "x": 190.2429962158203,
+ "y": -18.47599983215332
},
{
- "x": 190.21099853515625,
- "y": -61.803001403808594
+ "x": 193.03500366210938,
+ "y": -16.075000762939453
},
{
- "x": 191.1580047607422,
- "y": -58.80799865722656
+ "x": 195.83999633789062,
+ "y": -13.616000175476074
},
{
- "x": 192.05799865722656,
- "y": -55.79800033569336
+ "x": 198.65699768066406,
+ "y": -11.098999977111816
},
{
- "x": 192.91099548339844,
- "y": -52.77399826049805
+ "x": 201.48300170898438,
+ "y": -8.520000457763672
},
{
- "x": 193.71600341796875,
- "y": -49.73699951171875
+ "x": 204.31500244140625,
+ "y": -5.876999855041504
},
{
- "x": 194.47300720214844,
- "y": -46.68899917602539
+ "x": 207.1490020751953,
+ "y": -3.1700000762939453
},
{
- "x": 195.18299865722656,
- "y": -43.62799835205078
+ "x": 209.98300170898438,
+ "y": -0.39500001072883606
},
{
- "x": 195.843994140625,
- "y": -40.55699920654297
+ "x": 212.81300354003906,
+ "y": 2.447000026702881
},
{
- "x": 196.45700073242188,
- "y": -37.47600173950195
+ "x": 215.63499450683594,
+ "y": 5.361000061035156
},
{
- "x": 196.5659942626953,
- "y": -37.10100173950195
+ "x": 218.44700622558594,
+ "y": 8.345999717712402
},
{
- "x": 197.2519989013672,
- "y": -33
+ "x": 221.2449951171875,
+ "y": 11.404000282287598
+ },
+ {
+ "x": 224.0019989013672,
+ "y": 2.1570000648498535
+ },
+ {
+ "x": 226.16799926757812,
+ "y": 17
}
],
"isCurve": true,
@@ -904,336 +912,344 @@
"link": "",
"route": [
{
- "x": 197.2519989013672,
- "y": 33
+ "x": 226.16799926757812,
+ "y": 83
},
{
- "x": 197.02099609375,
- "y": 34.3849983215332
+ "x": 223.8699951171875,
+ "y": 85.6449966430664
},
{
- "x": 196.45700073242188,
- "y": 37.47600173950195
+ "x": 221.2449951171875,
+ "y": 88.59500122070312
},
{
- "x": 195.843994140625,
- "y": 40.55699920654297
+ "x": 218.44700622558594,
+ "y": 91.65299987792969
},
{
- "x": 195.18299865722656,
- "y": 43.62799835205078
+ "x": 215.63499450683594,
+ "y": 94.63800048828125
},
{
- "x": 194.47300720214844,
- "y": 46.68899917602539
+ "x": 212.81300354003906,
+ "y": 97.552001953125
},
{
- "x": 193.71600341796875,
- "y": 49.73699951171875
+ "x": 209.98300170898438,
+ "y": 100.3949966430664
},
{
- "x": 192.91099548339844,
- "y": 52.77399826049805
+ "x": 207.1490020751953,
+ "y": 103.16999816894531
},
{
- "x": 192.05799865722656,
- "y": 55.79800033569336
+ "x": 204.31500244140625,
+ "y": 105.87699890136719
},
{
- "x": 191.1580047607422,
- "y": 58.80799865722656
+ "x": 201.48300170898438,
+ "y": 108.5199966430664
},
{
- "x": 190.21099853515625,
- "y": 61.803001403808594
+ "x": 198.65699768066406,
+ "y": 111.0989990234375
},
{
- "x": 189.2169952392578,
- "y": 64.78299713134766
+ "x": 195.83999633789062,
+ "y": 113.61599731445312
},
{
- "x": 188.17599487304688,
- "y": 67.74700164794922
+ "x": 193.03500366210938,
+ "y": 116.07499694824219
},
{
- "x": 187.08799743652344,
- "y": 70.69400024414062
+ "x": 190.2429962158203,
+ "y": 118.47599792480469
},
{
- "x": 185.9550018310547,
- "y": 73.6240005493164
+ "x": 187.468994140625,
+ "y": 120.822998046875
},
{
- "x": 184.77499389648438,
- "y": 76.53600311279297
+ "x": 184.71299743652344,
+ "y": 123.11799621582031
},
{
- "x": 183.5500030517578,
- "y": 79.42900085449219
+ "x": 181.97900390625,
+ "y": 125.36399841308594
},
{
- "x": 182.27999877929688,
- "y": 82.302001953125
+ "x": 179.26800537109375,
+ "y": 127.56199645996094
},
{
- "x": 180.96499633789062,
- "y": 85.15499877929688
+ "x": 176.58299255371094,
+ "y": 129.7169952392578
},
{
- "x": 179.60499572753906,
- "y": 87.98699951171875
+ "x": 173.9250030517578,
+ "y": 131.8300018310547
},
{
- "x": 178.2010040283203,
- "y": 90.7979965209961
+ "x": 171.2949981689453,
+ "y": 133.9040069580078
},
{
- "x": 176.7530059814453,
- "y": 93.58499908447266
+ "x": 168.6959991455078,
+ "y": 135.94200134277344
},
{
- "x": 175.26100158691406,
- "y": 96.3499984741211
+ "x": 166.1280059814453,
+ "y": 137.947998046875
},
{
- "x": 173.7259979248047,
- "y": 99.09100341796875
+ "x": 163.59300231933594,
+ "y": 139.9239959716797
},
{
- "x": 172.1479949951172,
- "y": 101.80799865722656
+ "x": 161.09100341796875,
+ "y": 141.87399291992188
},
{
- "x": 170.5279998779297,
- "y": 104.4990005493164
+ "x": 158.6230010986328,
+ "y": 143.7989959716797
},
{
- "x": 168.86500549316406,
- "y": 107.16500091552734
+ "x": 156.19000244140625,
+ "y": 145.7030029296875
},
{
- "x": 167.16099548339844,
- "y": 109.80400085449219
+ "x": 153.79299926757812,
+ "y": 147.58999633789062
},
{
- "x": 165.41600036621094,
- "y": 112.41600036621094
+ "x": 151.42999267578125,
+ "y": 149.46200561523438
},
{
- "x": 163.62899780273438,
- "y": 115.0009994506836
+ "x": 149.10299682617188,
+ "y": 151.32200622558594
},
{
- "x": 161.80299377441406,
- "y": 117.55699920654297
+ "x": 146.81199645996094,
+ "y": 153.17300415039062
},
{
- "x": 159.93600463867188,
- "y": 120.08399963378906
+ "x": 144.55599975585938,
+ "y": 155.0189971923828
},
{
- "x": 158.031005859375,
- "y": 122.58100128173828
+ "x": 142.33399963378906,
+ "y": 156.86099243164062
},
{
- "x": 156.08599853515625,
- "y": 125.0479965209961
+ "x": 140.14700317382812,
+ "y": 158.7030029296875
},
{
- "x": 154.1020050048828,
- "y": 127.48400115966797
+ "x": 137.9929962158203,
+ "y": 160.54800415039062
},
{
- "x": 152.08099365234375,
- "y": 129.88900756835938
+ "x": 135.87100219726562,
+ "y": 162.39700317382812
},
{
- "x": 150.02200317382812,
- "y": 132.26199340820312
+ "x": 133.77999877929688,
+ "y": 164.2550048828125
},
{
- "x": 147.92599487304688,
- "y": 134.6020050048828
+ "x": 131.72000122070312,
+ "y": 166.1230010986328
},
{
- "x": 145.79299926757812,
- "y": 136.90899658203125
+ "x": 129.68800354003906,
+ "y": 168.0050048828125
},
{
- "x": 143.625,
- "y": 139.1820068359375
+ "x": 127.68299865722656,
+ "y": 169.9010009765625
},
{
- "x": 141.42100524902344,
- "y": 141.42100524902344
+ "x": 125.7040023803711,
+ "y": 171.81500244140625
},
{
- "x": 139.1820068359375,
- "y": 143.625
+ "x": 123.7490005493164,
+ "y": 173.74899291992188
},
{
- "x": 136.90899658203125,
- "y": 145.79299926757812
+ "x": 121.81500244140625,
+ "y": 175.70399475097656
},
{
- "x": 134.6020050048828,
- "y": 147.92599487304688
+ "x": 119.9010009765625,
+ "y": 177.68299865722656
},
{
- "x": 132.26199340820312,
- "y": 150.02200317382812
+ "x": 118.00499725341797,
+ "y": 179.68800354003906
},
{
- "x": 129.88900756835938,
- "y": 152.08099365234375
+ "x": 116.12300109863281,
+ "y": 181.72000122070312
},
{
- "x": 127.48400115966797,
- "y": 154.1020050048828
+ "x": 114.25499725341797,
+ "y": 183.77999877929688
},
{
- "x": 125.0479965209961,
- "y": 156.08599853515625
+ "x": 112.39700317382812,
+ "y": 185.87100219726562
},
{
- "x": 122.58100128173828,
- "y": 158.031005859375
+ "x": 110.5479965209961,
+ "y": 187.9929962158203
},
{
- "x": 120.08399963378906,
- "y": 159.93600463867188
+ "x": 108.7030029296875,
+ "y": 190.14700317382812
},
{
- "x": 117.55699920654297,
- "y": 161.80299377441406
+ "x": 106.86100006103516,
+ "y": 192.33399963378906
},
{
- "x": 115.0009994506836,
- "y": 163.62899780273438
+ "x": 105.01899719238281,
+ "y": 194.55599975585938
},
{
- "x": 112.41600036621094,
- "y": 165.41600036621094
+ "x": 103.1729965209961,
+ "y": 196.81199645996094
},
{
- "x": 109.80400085449219,
- "y": 167.16099548339844
+ "x": 101.3219985961914,
+ "y": 199.10299682617188
},
{
- "x": 107.16500091552734,
- "y": 168.86500549316406
+ "x": 99.46199798583984,
+ "y": 201.42999267578125
},
{
- "x": 104.4990005493164,
- "y": 170.5279998779297
+ "x": 97.58999633789062,
+ "y": 203.79299926757812
},
{
- "x": 101.80799865722656,
- "y": 172.1479949951172
+ "x": 95.7030029296875,
+ "y": 206.19000244140625
},
{
- "x": 99.09100341796875,
- "y": 173.7259979248047
+ "x": 93.79900360107422,
+ "y": 208.6230010986328
},
{
- "x": 96.3499984741211,
- "y": 175.26100158691406
+ "x": 91.8740005493164,
+ "y": 211.09100341796875
},
{
- "x": 93.58499908447266,
- "y": 176.7530059814453
+ "x": 89.92400360107422,
+ "y": 213.59300231933594
},
{
- "x": 90.7979965209961,
- "y": 178.2010040283203
+ "x": 87.947998046875,
+ "y": 216.1280059814453
},
{
- "x": 87.98699951171875,
- "y": 179.60499572753906
+ "x": 85.94200134277344,
+ "y": 218.6959991455078
},
{
- "x": 85.15499877929688,
- "y": 180.96499633789062
+ "x": 83.90399932861328,
+ "y": 221.2949981689453
},
{
- "x": 82.302001953125,
- "y": 182.27999877929688
+ "x": 81.83000183105469,
+ "y": 223.9250030517578
},
{
- "x": 79.42900085449219,
- "y": 183.5500030517578
+ "x": 79.71700286865234,
+ "y": 226.58299255371094
},
{
- "x": 76.53600311279297,
- "y": 184.77499389648438
+ "x": 77.56199645996094,
+ "y": 229.26800537109375
},
{
- "x": 73.6240005493164,
- "y": 185.9550018310547
+ "x": 75.36399841308594,
+ "y": 231.97900390625
},
{
- "x": 70.69400024414062,
- "y": 187.08799743652344
+ "x": 73.11799621582031,
+ "y": 234.71299743652344
},
{
- "x": 67.74700164794922,
- "y": 188.17599487304688
+ "x": 70.822998046875,
+ "y": 237.468994140625
},
{
- "x": 64.78299713134766,
- "y": 189.2169952392578
+ "x": 68.47599792480469,
+ "y": 240.2429962158203
},
{
- "x": 61.803001403808594,
- "y": 190.21099853515625
+ "x": 66.07499694824219,
+ "y": 243.03500366210938
},
{
- "x": 58.80799865722656,
- "y": 191.1580047607422
+ "x": 63.61600112915039,
+ "y": 245.83999633789062
},
{
- "x": 55.79800033569336,
- "y": 192.05799865722656
+ "x": 61.0989990234375,
+ "y": 248.65699768066406
},
{
- "x": 52.77399826049805,
- "y": 192.91099548339844
+ "x": 58.52000045776367,
+ "y": 251.48300170898438
},
{
- "x": 49.73699951171875,
- "y": 193.71600341796875
+ "x": 55.87699890136719,
+ "y": 254.31500244140625
},
{
- "x": 46.68899917602539,
- "y": 194.47300720214844
+ "x": 53.16999816894531,
+ "y": 257.14898681640625
},
{
- "x": 43.62799835205078,
- "y": 195.18299865722656
+ "x": 50.39500045776367,
+ "y": 259.9830017089844
},
{
- "x": 40.55699920654297,
- "y": 195.843994140625
+ "x": 47.551998138427734,
+ "y": 262.81298828125
},
{
- "x": 37.47600173950195,
- "y": 196.45700073242188
+ "x": 44.63800048828125,
+ "y": 265.635009765625
},
{
- "x": 34.3849983215332,
- "y": 197.02099609375
+ "x": 41.65299987792969,
+ "y": 268.4469909667969
},
{
- "x": 31.285999298095703,
- "y": 197.53700256347656
+ "x": 38.595001220703125,
+ "y": 271.2449951171875
},
{
- "x": 30.621999740600586,
- "y": 197.6790008544922
+ "x": 35.4640007019043,
+ "y": 274.0249938964844
+ },
+ {
+ "x": 32.257999420166016,
+ "y": 276.7829895019531
+ },
+ {
+ "x": 41.402000427246094,
+ "y": 279.8280029296875
},
{
"x": 26.5,
- "y": 198.22999572753906
+ "y": 281.53399658203125
}
],
"isCurve": true,
@@ -1269,335 +1285,343 @@
"route": [
{
"x": -26.499000549316406,
- "y": 198.22999572753906
+ "y": 281.53399658203125
},
{
- "x": -28.18000030517578,
- "y": 198.00399780273438
+ "x": -29.191999435424805,
+ "y": 279.3429870605469
},
{
- "x": -31.285999298095703,
- "y": 197.53700256347656
+ "x": -32.257999420166016,
+ "y": 276.7829895019531
},
{
- "x": -34.3849983215332,
- "y": 197.02099609375
+ "x": -35.4640007019043,
+ "y": 274.0249938964844
},
{
- "x": -37.47600173950195,
- "y": 196.45700073242188
+ "x": -38.595001220703125,
+ "y": 271.2449951171875
},
{
- "x": -40.55699920654297,
- "y": 195.843994140625
+ "x": -41.65299987792969,
+ "y": 268.4469909667969
},
{
- "x": -43.62799835205078,
- "y": 195.18299865722656
+ "x": -44.63800048828125,
+ "y": 265.635009765625
},
{
- "x": -46.68899917602539,
- "y": 194.47300720214844
+ "x": -47.551998138427734,
+ "y": 262.81298828125
},
{
- "x": -49.73699951171875,
- "y": 193.71600341796875
+ "x": -50.39500045776367,
+ "y": 259.9830017089844
},
{
- "x": -52.77399826049805,
- "y": 192.91099548339844
+ "x": -53.16999816894531,
+ "y": 257.14898681640625
},
{
- "x": -55.79800033569336,
- "y": 192.05799865722656
+ "x": -55.87699890136719,
+ "y": 254.31500244140625
},
{
- "x": -58.80799865722656,
- "y": 191.1580047607422
+ "x": -58.52000045776367,
+ "y": 251.48300170898438
},
{
- "x": -61.803001403808594,
- "y": 190.21099853515625
+ "x": -61.0989990234375,
+ "y": 248.65699768066406
},
{
- "x": -64.78299713134766,
- "y": 189.2169952392578
+ "x": -63.61600112915039,
+ "y": 245.83999633789062
},
{
- "x": -67.74700164794922,
- "y": 188.17599487304688
+ "x": -66.07499694824219,
+ "y": 243.03500366210938
},
{
- "x": -70.69400024414062,
- "y": 187.08799743652344
+ "x": -68.47599792480469,
+ "y": 240.2429962158203
},
{
- "x": -73.6240005493164,
- "y": 185.9550018310547
+ "x": -70.822998046875,
+ "y": 237.468994140625
},
{
- "x": -76.53600311279297,
- "y": 184.77499389648438
+ "x": -73.11799621582031,
+ "y": 234.71299743652344
},
{
- "x": -79.42900085449219,
- "y": 183.5500030517578
+ "x": -75.36399841308594,
+ "y": 231.97900390625
},
{
- "x": -82.302001953125,
- "y": 182.27999877929688
+ "x": -77.56199645996094,
+ "y": 229.26800537109375
},
{
- "x": -85.15499877929688,
- "y": 180.96499633789062
+ "x": -79.71700286865234,
+ "y": 226.58299255371094
},
{
- "x": -87.98699951171875,
- "y": 179.60499572753906
+ "x": -81.83000183105469,
+ "y": 223.9250030517578
},
{
- "x": -90.7979965209961,
- "y": 178.2010040283203
+ "x": -83.90399932861328,
+ "y": 221.2949981689453
},
{
- "x": -93.58499908447266,
- "y": 176.7530059814453
+ "x": -85.94200134277344,
+ "y": 218.6959991455078
},
{
- "x": -96.3499984741211,
- "y": 175.26100158691406
+ "x": -87.947998046875,
+ "y": 216.1280059814453
},
{
- "x": -99.09100341796875,
- "y": 173.7259979248047
+ "x": -89.92400360107422,
+ "y": 213.59300231933594
},
{
- "x": -101.80799865722656,
- "y": 172.1479949951172
+ "x": -91.8740005493164,
+ "y": 211.09100341796875
},
{
- "x": -104.4990005493164,
- "y": 170.5279998779297
+ "x": -93.79900360107422,
+ "y": 208.6230010986328
},
{
- "x": -107.16500091552734,
- "y": 168.86500549316406
+ "x": -95.7030029296875,
+ "y": 206.19000244140625
},
{
- "x": -109.80400085449219,
- "y": 167.16099548339844
+ "x": -97.58999633789062,
+ "y": 203.79299926757812
},
{
- "x": -112.41600036621094,
- "y": 165.41600036621094
+ "x": -99.46199798583984,
+ "y": 201.42999267578125
},
{
- "x": -115.0009994506836,
- "y": 163.62899780273438
+ "x": -101.3219985961914,
+ "y": 199.10299682617188
},
{
- "x": -117.55699920654297,
- "y": 161.80299377441406
+ "x": -103.1729965209961,
+ "y": 196.81199645996094
},
{
- "x": -120.08399963378906,
- "y": 159.93600463867188
+ "x": -105.01899719238281,
+ "y": 194.55599975585938
},
{
- "x": -122.58100128173828,
- "y": 158.031005859375
+ "x": -106.86100006103516,
+ "y": 192.33399963378906
},
{
- "x": -125.0479965209961,
- "y": 156.08599853515625
+ "x": -108.7030029296875,
+ "y": 190.14700317382812
},
{
- "x": -127.48400115966797,
- "y": 154.1020050048828
+ "x": -110.5479965209961,
+ "y": 187.9929962158203
},
{
- "x": -129.88900756835938,
- "y": 152.08099365234375
+ "x": -112.39700317382812,
+ "y": 185.87100219726562
},
{
- "x": -132.26199340820312,
- "y": 150.02200317382812
+ "x": -114.25499725341797,
+ "y": 183.77999877929688
},
{
- "x": -134.6020050048828,
- "y": 147.92599487304688
+ "x": -116.12300109863281,
+ "y": 181.72000122070312
},
{
- "x": -136.90899658203125,
- "y": 145.79299926757812
+ "x": -118.00499725341797,
+ "y": 179.68800354003906
},
{
- "x": -139.1820068359375,
- "y": 143.625
+ "x": -119.9010009765625,
+ "y": 177.68299865722656
},
{
- "x": -141.42100524902344,
- "y": 141.42100524902344
+ "x": -121.81500244140625,
+ "y": 175.70399475097656
},
{
- "x": -143.625,
- "y": 139.1820068359375
+ "x": -123.7490005493164,
+ "y": 173.74899291992188
},
{
- "x": -145.79299926757812,
- "y": 136.90899658203125
+ "x": -125.7040023803711,
+ "y": 171.81500244140625
},
{
- "x": -147.92599487304688,
- "y": 134.6020050048828
+ "x": -127.68299865722656,
+ "y": 169.9010009765625
},
{
- "x": -150.02200317382812,
- "y": 132.26199340820312
+ "x": -129.68800354003906,
+ "y": 168.0050048828125
},
{
- "x": -152.08099365234375,
- "y": 129.88900756835938
+ "x": -131.72000122070312,
+ "y": 166.1230010986328
},
{
- "x": -154.1020050048828,
- "y": 127.48400115966797
+ "x": -133.77999877929688,
+ "y": 164.2550048828125
},
{
- "x": -156.08599853515625,
- "y": 125.0479965209961
+ "x": -135.87100219726562,
+ "y": 162.39700317382812
},
{
- "x": -158.031005859375,
- "y": 122.58100128173828
+ "x": -137.9929962158203,
+ "y": 160.54800415039062
},
{
- "x": -159.93600463867188,
- "y": 120.08399963378906
+ "x": -140.14700317382812,
+ "y": 158.7030029296875
},
{
- "x": -161.80299377441406,
- "y": 117.55699920654297
+ "x": -142.33399963378906,
+ "y": 156.86099243164062
},
{
- "x": -163.62899780273438,
- "y": 115.0009994506836
+ "x": -144.55599975585938,
+ "y": 155.0189971923828
},
{
- "x": -165.41600036621094,
- "y": 112.41600036621094
+ "x": -146.81199645996094,
+ "y": 153.17300415039062
},
{
- "x": -167.16099548339844,
- "y": 109.80400085449219
+ "x": -149.10299682617188,
+ "y": 151.32200622558594
},
{
- "x": -168.86500549316406,
- "y": 107.16500091552734
+ "x": -151.42999267578125,
+ "y": 149.46200561523438
},
{
- "x": -170.5279998779297,
- "y": 104.4990005493164
+ "x": -153.79299926757812,
+ "y": 147.58999633789062
},
{
- "x": -172.1479949951172,
- "y": 101.80799865722656
+ "x": -156.19000244140625,
+ "y": 145.7030029296875
},
{
- "x": -173.7259979248047,
- "y": 99.09100341796875
+ "x": -158.6230010986328,
+ "y": 143.7989959716797
},
{
- "x": -175.26100158691406,
- "y": 96.3499984741211
+ "x": -161.09100341796875,
+ "y": 141.87399291992188
},
{
- "x": -176.7530059814453,
- "y": 93.58499908447266
+ "x": -163.59300231933594,
+ "y": 139.9239959716797
},
{
- "x": -178.2010040283203,
- "y": 90.7979965209961
+ "x": -166.1280059814453,
+ "y": 137.947998046875
},
{
- "x": -179.60499572753906,
- "y": 87.98699951171875
+ "x": -168.6959991455078,
+ "y": 135.94200134277344
},
{
- "x": -180.96499633789062,
- "y": 85.15499877929688
+ "x": -171.2949981689453,
+ "y": 133.9040069580078
},
{
- "x": -182.27999877929688,
- "y": 82.302001953125
+ "x": -173.9250030517578,
+ "y": 131.8300018310547
},
{
- "x": -183.5500030517578,
- "y": 79.42900085449219
+ "x": -176.58299255371094,
+ "y": 129.7169952392578
},
{
- "x": -184.77499389648438,
- "y": 76.53600311279297
+ "x": -179.26800537109375,
+ "y": 127.56199645996094
},
{
- "x": -185.9550018310547,
- "y": 73.6240005493164
+ "x": -181.97900390625,
+ "y": 125.36399841308594
},
{
- "x": -187.08799743652344,
- "y": 70.69400024414062
+ "x": -184.71299743652344,
+ "y": 123.11799621582031
},
{
- "x": -188.17599487304688,
- "y": 67.74700164794922
+ "x": -187.468994140625,
+ "y": 120.822998046875
},
{
- "x": -189.2169952392578,
- "y": 64.78299713134766
+ "x": -190.2429962158203,
+ "y": 118.47599792480469
},
{
- "x": -190.21099853515625,
- "y": 61.803001403808594
+ "x": -193.03500366210938,
+ "y": 116.07499694824219
},
{
- "x": -191.1580047607422,
- "y": 58.80799865722656
+ "x": -195.83999633789062,
+ "y": 113.61599731445312
},
{
- "x": -192.05799865722656,
- "y": 55.79800033569336
+ "x": -198.65699768066406,
+ "y": 111.0989990234375
},
{
- "x": -192.91099548339844,
- "y": 52.77399826049805
+ "x": -201.48300170898438,
+ "y": 108.5199966430664
},
{
- "x": -193.71600341796875,
- "y": 49.73699951171875
+ "x": -204.31500244140625,
+ "y": 105.87699890136719
},
{
- "x": -194.47300720214844,
- "y": 46.68899917602539
+ "x": -207.1490020751953,
+ "y": 103.16999816894531
},
{
- "x": -195.18299865722656,
- "y": 43.62799835205078
+ "x": -209.98300170898438,
+ "y": 100.3949966430664
},
{
- "x": -195.843994140625,
- "y": 40.55699920654297
+ "x": -212.81300354003906,
+ "y": 97.552001953125
},
{
- "x": -196.45700073242188,
- "y": 37.47600173950195
+ "x": -215.63499450683594,
+ "y": 94.63800048828125
},
{
- "x": -196.5659942626953,
- "y": 37.10100173950195
+ "x": -218.44700622558594,
+ "y": 91.65299987792969
},
{
- "x": -197.2519989013672,
- "y": 33
+ "x": -221.2449951171875,
+ "y": 88.59500122070312
+ },
+ {
+ "x": -224.0019989013672,
+ "y": 97.84200286865234
+ },
+ {
+ "x": -226.16799926757812,
+ "y": 83
}
],
"isCurve": true,
@@ -1632,352 +1656,408 @@
"link": "",
"route": [
{
- "x": 539.5,
- "y": -148.2259979248047
+ "x": 616.2650146484375,
+ "y": -192
},
{
- "x": 542.2160034179688,
- "y": -147.85400390625
+ "x": 618.9769897460938,
+ "y": -176.81300354003906
},
{
- "x": 546.35302734375,
- "y": -147.19900512695312
+ "x": 623.2459716796875,
+ "y": -170.0500030517578
},
{
- "x": 550.4760131835938,
- "y": -146.45700073242188
+ "x": 628.22802734375,
+ "y": -167.43899536132812
},
{
- "x": 554.5819702148438,
- "y": -145.62899780273438
+ "x": 633.1060180664062,
+ "y": -164.73399353027344
},
{
- "x": 558.6699829101562,
- "y": -144.71499633789062
+ "x": 637.8790283203125,
+ "y": -161.9409942626953
},
{
- "x": 562.7369995117188,
- "y": -143.71600341796875
+ "x": 642.5449829101562,
+ "y": -159.0659942626953
},
{
- "x": 566.7830200195312,
- "y": -142.6320037841797
+ "x": 647.10302734375,
+ "y": -156.11500549316406
},
{
- "x": 570.8060302734375,
- "y": -141.46299743652344
+ "x": 651.5540161132812,
+ "y": -153.09100341796875
},
{
- "x": 574.802978515625,
- "y": -140.21099853515625
+ "x": 655.89697265625,
+ "y": -150.0019989013672
},
{
- "x": 578.7730102539062,
- "y": -138.875
+ "x": 660.1320190429688,
+ "y": -146.85299682617188
},
{
- "x": 582.7139892578125,
- "y": -137.45599365234375
+ "x": 664.2589721679688,
+ "y": -143.6479949951172
},
{
- "x": 586.6240234375,
- "y": -135.9550018310547
+ "x": 668.2789916992188,
+ "y": -140.39199829101562
},
{
- "x": 590.5029907226562,
- "y": -134.3719940185547
+ "x": 672.1929931640625,
+ "y": -137.09100341796875
},
{
- "x": 594.3469848632812,
- "y": -132.70899963378906
+ "x": 676.0020141601562,
+ "y": -133.75
},
{
- "x": 598.155029296875,
- "y": -130.96499633789062
+ "x": 679.7059936523438,
+ "y": -130.3730010986328
},
{
- "x": 601.927001953125,
- "y": -129.14199829101562
+ "x": 683.3090209960938,
+ "y": -126.96499633789062
},
{
- "x": 605.6589965820312,
- "y": -127.23999786376953
+ "x": 686.8099975585938,
+ "y": -123.53099822998047
},
{
- "x": 609.3499755859375,
- "y": -125.26100158691406
+ "x": 690.2130126953125,
+ "y": -120.0739974975586
},
{
- "x": 613,
- "y": -123.20500183105469
+ "x": 693.5189819335938,
+ "y": -116.5989990234375
},
{
- "x": 616.60498046875,
- "y": -121.0719985961914
+ "x": 696.72998046875,
+ "y": -113.11100006103516
},
{
- "x": 620.1649780273438,
- "y": -118.86499786376953
+ "x": 699.8499755859375,
+ "y": -109.61100006103516
},
{
- "x": 623.677978515625,
- "y": -116.58399963378906
+ "x": 702.8800048828125,
+ "y": -106.1050033569336
},
{
- "x": 627.1420288085938,
- "y": -114.22899627685547
+ "x": 705.823974609375,
+ "y": -102.59600067138672
},
{
- "x": 630.5570068359375,
- "y": -111.8030014038086
+ "x": 708.6840209960938,
+ "y": -99.08599853515625
},
{
- "x": 633.9190063476562,
- "y": -109.30500030517578
+ "x": 711.4639892578125,
+ "y": -95.5790023803711
},
{
- "x": 637.22900390625,
- "y": -106.73799896240234
+ "x": 714.166015625,
+ "y": -92.0770034790039
},
{
- "x": 640.4840087890625,
- "y": -104.10199737548828
+ "x": 716.7940063476562,
+ "y": -88.58399963378906
},
{
- "x": 643.6840209960938,
- "y": -101.39900207519531
+ "x": 719.3510131835938,
+ "y": -85.0999984741211
},
{
- "x": 646.8259887695312,
- "y": -98.62799835205078
+ "x": 721.8400268554688,
+ "y": -81.62799835205078
},
{
- "x": 649.9089965820312,
- "y": -95.79299926757812
+ "x": 724.2659912109375,
+ "y": -78.16899871826172
},
{
- "x": 652.9320068359375,
- "y": -92.89399719238281
+ "x": 726.6309814453125,
+ "y": -74.72699737548828
},
{
- "x": 655.8939819335938,
- "y": -89.93199920654297
+ "x": 728.9390258789062,
+ "y": -71.30000305175781
},
{
- "x": 658.7930297851562,
- "y": -86.90899658203125
+ "x": 731.1939697265625,
+ "y": -67.89099884033203
},
{
- "x": 661.6279907226562,
- "y": -83.82599639892578
+ "x": 733.3980102539062,
+ "y": -64.5009994506836
},
{
- "x": 664.3989868164062,
- "y": -80.68399810791016
+ "x": 735.5560302734375,
+ "y": -61.130001068115234
},
{
- "x": 667.1019897460938,
- "y": -77.48400115966797
+ "x": 737.6719970703125,
+ "y": -57.777000427246094
},
{
- "x": 669.7379760742188,
- "y": -74.22899627685547
+ "x": 739.7470092773438,
+ "y": -54.444000244140625
},
{
- "x": 672.3049926757812,
- "y": -70.91899871826172
+ "x": 741.7869873046875,
+ "y": -51.130001068115234
},
{
- "x": 674.802978515625,
- "y": -67.55699920654297
+ "x": 743.7940063476562,
+ "y": -47.834999084472656
},
{
- "x": 677.22900390625,
- "y": -64.14199829101562
+ "x": 745.77099609375,
+ "y": -44.55799865722656
},
{
- "x": 679.583984375,
- "y": -60.678001403808594
+ "x": 747.7219848632812,
+ "y": -41.29800033569336
},
{
- "x": 681.864990234375,
- "y": -57.165000915527344
+ "x": 749.6500244140625,
+ "y": -38.05400085449219
},
{
- "x": 684.072021484375,
- "y": -53.60499954223633
+ "x": 751.5570068359375,
+ "y": -34.82600021362305
},
{
- "x": 686.2050170898438,
- "y": -50
+ "x": 753.447021484375,
+ "y": -31.611000061035156
},
{
- "x": 688.260986328125,
- "y": -46.349998474121094
+ "x": 755.3209838867188,
+ "y": -28.406999588012695
},
{
- "x": 690.239990234375,
- "y": -42.659000396728516
+ "x": 757.1840209960938,
+ "y": -25.214000701904297
},
{
- "x": 692.1420288085938,
- "y": -38.926998138427734
+ "x": 759.0360107421875,
+ "y": -22.02899932861328
},
{
- "x": 693.9650268554688,
- "y": -35.154998779296875
+ "x": 760.8800048828125,
+ "y": -18.849000930786133
},
{
- "x": 695.708984375,
- "y": -31.347000122070312
+ "x": 762.718994140625,
+ "y": -15.673999786376953
},
{
- "x": 697.3720092773438,
- "y": -27.503000259399414
+ "x": 764.552978515625,
+ "y": -12.49899959564209
},
{
- "x": 698.9550170898438,
- "y": -23.624000549316406
+ "x": 766.385009765625,
+ "y": -9.322999954223633
},
{
- "x": 700.4559936523438,
- "y": -19.714000701904297
+ "x": 768.2160034179688,
+ "y": -6.14300012588501
},
{
- "x": 701.875,
- "y": -15.77299976348877
+ "x": 770.0479736328125,
+ "y": -2.9560000896453857
},
{
- "x": 703.2109985351562,
- "y": -11.803000450134277
+ "x": 771.8800048828125,
+ "y": 0.23999999463558197
},
{
- "x": 704.4630126953125,
- "y": -7.806000232696533
+ "x": 773.7139892578125,
+ "y": 3.4489998817443848
},
{
- "x": 705.6320190429688,
- "y": -3.7829999923706055
+ "x": 775.551025390625,
+ "y": 6.673999786376953
},
{
- "x": 706.7160034179688,
- "y": 0.2619999945163727
+ "x": 777.3909912109375,
+ "y": 9.918000221252441
},
{
- "x": 707.7150268554688,
- "y": 4.328999996185303
+ "x": 779.2329711914062,
+ "y": 13.184000015258789
},
{
- "x": 708.6290283203125,
- "y": 8.416999816894531
+ "x": 781.0780029296875,
+ "y": 16.47599983215332
},
{
- "x": 709.4569702148438,
- "y": 12.52299976348877
+ "x": 782.926025390625,
+ "y": 19.795000076293945
},
{
- "x": 710.198974609375,
- "y": 16.645999908447266
+ "x": 784.7750244140625,
+ "y": 23.145999908447266
},
{
- "x": 710.85400390625,
- "y": 20.783000946044922
+ "x": 786.6259765625,
+ "y": 26.531999588012695
},
{
- "x": 711.4219970703125,
- "y": 24.933000564575195
+ "x": 788.4760131835938,
+ "y": 29.954999923706055
},
{
- "x": 711.9039916992188,
- "y": 29.0939998626709
+ "x": 790.323974609375,
+ "y": 33.41899871826172
},
{
- "x": 712.2979736328125,
- "y": 33.263999938964844
+ "x": 792.1699829101562,
+ "y": 36.926998138427734
},
{
- "x": 712.60498046875,
- "y": 37.441001892089844
+ "x": 794.010986328125,
+ "y": 40.481998443603516
},
{
- "x": 712.823974609375,
- "y": 41.624000549316406
+ "x": 795.844970703125,
+ "y": 44.08599853515625
},
{
- "x": 712.9559936523438,
- "y": 45.81100082397461
+ "x": 797.6690063476562,
+ "y": 47.74300003051758
},
{
- "x": 713,
- "y": 50
+ "x": 799.4829711914062,
+ "y": 51.45500183105469
},
{
- "x": 712.9559936523438,
- "y": 54.1879997253418
+ "x": 801.281982421875,
+ "y": 55.224998474121094
},
{
- "x": 712.823974609375,
- "y": 58.375
+ "x": 803.0640258789062,
+ "y": 59.05500030517578
},
{
- "x": 712.60498046875,
- "y": 62.55799865722656
+ "x": 804.8259887695312,
+ "y": 62.946998596191406
},
{
- "x": 712.2979736328125,
- "y": 66.73500061035156
+ "x": 806.5650024414062,
+ "y": 66.90299987792969
},
{
- "x": 711.9039916992188,
- "y": 70.90499877929688
+ "x": 808.2760009765625,
+ "y": 70.9260025024414
},
{
- "x": 711.4219970703125,
- "y": 75.06600189208984
+ "x": 809.9580078125,
+ "y": 75.01699829101562
},
{
- "x": 710.85400390625,
- "y": 79.21600341796875
+ "x": 811.60498046875,
+ "y": 79.1780014038086
},
{
- "x": 710.198974609375,
- "y": 83.35299682617188
+ "x": 813.2150268554688,
+ "y": 83.41000366210938
},
{
- "x": 709.4569702148438,
- "y": 87.47599792480469
+ "x": 814.781982421875,
+ "y": 87.71399688720703
},
{
- "x": 708.6290283203125,
- "y": 91.58200073242188
+ "x": 816.302978515625,
+ "y": 92.09100341796875
},
{
- "x": 707.7150268554688,
- "y": 95.66999816894531
+ "x": 817.7739868164062,
+ "y": 96.54199981689453
},
{
- "x": 706.7160034179688,
- "y": 99.73699951171875
+ "x": 819.1890258789062,
+ "y": 101.06800079345703
},
{
- "x": 705.6320190429688,
- "y": 103.78299713134766
+ "x": 820.5460205078125,
+ "y": 105.66799926757812
},
{
- "x": 704.4630126953125,
- "y": 107.80599975585938
+ "x": 821.8380126953125,
+ "y": 110.34300231933594
},
{
- "x": 703.2109985351562,
- "y": 111.8030014038086
+ "x": 823.0609741210938,
+ "y": 115.09300231933594
},
{
- "x": 702.8259887695312,
- "y": 113.08100128173828
+ "x": 824.2119750976562,
+ "y": 119.91600036621094
},
{
- "x": 701.4329833984375,
- "y": 116.9990005493164
+ "x": 825.2839965820312,
+ "y": 124.81300354003906
+ },
+ {
+ "x": 826.2730102539062,
+ "y": 129.78199768066406
+ },
+ {
+ "x": 827.1749877929688,
+ "y": 134.82200622558594
+ },
+ {
+ "x": 827.9840087890625,
+ "y": 139.93099975585938
+ },
+ {
+ "x": 828.6959838867188,
+ "y": 145.10800170898438
+ },
+ {
+ "x": 829.3070068359375,
+ "y": 150.3509979248047
+ },
+ {
+ "x": 829.8099975585938,
+ "y": 155.656005859375
+ },
+ {
+ "x": 830.2030029296875,
+ "y": 161.02200317382812
+ },
+ {
+ "x": 830.47998046875,
+ "y": 166.4459991455078
+ },
+ {
+ "x": 830.635986328125,
+ "y": 171.9239959716797
+ },
+ {
+ "x": 830.6690063476562,
+ "y": 177.45399475097656
+ },
+ {
+ "x": 830.572021484375,
+ "y": 183.031005859375
+ },
+ {
+ "x": 830.343017578125,
+ "y": 188.65199279785156
+ },
+ {
+ "x": 853.6510009765625,
+ "y": 192.91200256347656
+ },
+ {
+ "x": 846.3070068359375,
+ "y": 205.99099731445312
}
],
"isCurve": true,
@@ -2012,336 +2092,408 @@
"link": "",
"route": [
{
- "x": 662.3569946289062,
- "y": 182.99899291992188
+ "x": 846.3070068359375,
+ "y": 213.0070037841797
},
{
- "x": 661.6279907226562,
- "y": 183.8260040283203
+ "x": 829.0159912109375,
+ "y": 206.5030059814453
},
{
- "x": 658.7930297851562,
- "y": 186.90899658203125
+ "x": 820.0969848632812,
+ "y": 206.3979949951172
},
{
- "x": 655.8939819335938,
- "y": 189.9320068359375
+ "x": 815.343994140625,
+ "y": 209.40699768066406
},
{
- "x": 652.9320068359375,
- "y": 192.8939971923828
+ "x": 810.56201171875,
+ "y": 212.2790069580078
},
{
- "x": 649.9089965820312,
- "y": 195.79299926757812
+ "x": 805.7570190429688,
+ "y": 215.01600646972656
},
{
- "x": 646.8259887695312,
- "y": 198.6280059814453
+ "x": 800.9349975585938,
+ "y": 217.6199951171875
},
{
- "x": 643.6840209960938,
- "y": 201.3990020751953
+ "x": 796.0989990234375,
+ "y": 220.0919952392578
},
{
- "x": 640.4840087890625,
- "y": 204.1020050048828
+ "x": 791.2559814453125,
+ "y": 222.43499755859375
},
{
- "x": 637.22900390625,
- "y": 206.73800659179688
+ "x": 786.4089965820312,
+ "y": 224.6510009765625
},
{
- "x": 633.9190063476562,
- "y": 209.30499267578125
+ "x": 781.5640258789062,
+ "y": 226.74400329589844
},
{
- "x": 630.5570068359375,
- "y": 211.80299377441406
+ "x": 776.7239990234375,
+ "y": 228.71600341796875
},
{
- "x": 627.1420288085938,
- "y": 214.22900390625
+ "x": 771.89501953125,
+ "y": 230.56900024414062
},
{
- "x": 623.677978515625,
- "y": 216.58399963378906
+ "x": 767.0800170898438,
+ "y": 232.30799865722656
},
{
- "x": 620.1649780273438,
- "y": 218.86500549316406
+ "x": 762.281982421875,
+ "y": 233.93600463867188
},
{
- "x": 616.60498046875,
- "y": 221.07200622558594
+ "x": 757.5050048828125,
+ "y": 235.45599365234375
+ },
+ {
+ "x": 752.7520141601562,
+ "y": 236.8719940185547
+ },
+ {
+ "x": 748.0269775390625,
+ "y": 238.18699645996094
+ },
+ {
+ "x": 743.3330078125,
+ "y": 239.40499877929688
+ },
+ {
+ "x": 738.6699829101562,
+ "y": 240.531005859375
+ },
+ {
+ "x": 734.0430297851562,
+ "y": 241.5679931640625
+ },
+ {
+ "x": 729.4530029296875,
+ "y": 242.52000427246094
+ },
+ {
+ "x": 724.9019775390625,
+ "y": 243.39100646972656
+ },
+ {
+ "x": 720.3900146484375,
+ "y": 244.18600463867188
+ },
+ {
+ "x": 715.9210205078125,
+ "y": 244.9080047607422
+ },
+ {
+ "x": 711.4940185546875,
+ "y": 245.56199645996094
+ },
+ {
+ "x": 707.1099853515625,
+ "y": 246.1510009765625
+ },
+ {
+ "x": 702.77001953125,
+ "y": 246.67999267578125
+ },
+ {
+ "x": 698.4749755859375,
+ "y": 247.1529998779297
+ },
+ {
+ "x": 694.2230224609375,
+ "y": 247.572998046875
+ },
+ {
+ "x": 690.0150146484375,
+ "y": 247.94400024414062
+ },
+ {
+ "x": 685.8510131835938,
+ "y": 248.27099609375
+ },
+ {
+ "x": 681.72998046875,
+ "y": 248.5570068359375
+ },
+ {
+ "x": 677.6500244140625,
+ "y": 248.80499267578125
+ },
+ {
+ "x": 673.6119995117188,
+ "y": 249.0189971923828
+ },
+ {
+ "x": 669.6129760742188,
+ "y": 249.20199584960938
+ },
+ {
+ "x": 665.6519775390625,
+ "y": 249.35800170898438
+ },
+ {
+ "x": 661.72802734375,
+ "y": 249.48899841308594
+ },
+ {
+ "x": 657.8380126953125,
+ "y": 249.59800720214844
+ },
+ {
+ "x": 653.9810180664062,
+ "y": 249.68800354003906
+ },
+ {
+ "x": 650.1539916992188,
+ "y": 249.76199340820312
+ },
+ {
+ "x": 646.3560180664062,
+ "y": 249.82200622558594
+ },
+ {
+ "x": 642.5830078125,
+ "y": 249.8699951171875
+ },
+ {
+ "x": 638.8330078125,
+ "y": 249.90699768066406
+ },
+ {
+ "x": 635.10400390625,
+ "y": 249.93600463867188
+ },
+ {
+ "x": 631.3920288085938,
+ "y": 249.95799255371094
+ },
+ {
+ "x": 627.6959838867188,
+ "y": 249.9739990234375
+ },
+ {
+ "x": 624.010986328125,
+ "y": 249.98500061035156
+ },
+ {
+ "x": 620.3350219726562,
+ "y": 249.9929962158203
+ },
+ {
+ "x": 616.666015625,
+ "y": 249.9969940185547
},
{
"x": 613,
- "y": 223.2050018310547
+ "y": 249.99899291992188
},
{
- "x": 609.3499755859375,
- "y": 225.26100158691406
+ "x": 609.3330078125,
+ "y": 249.9969940185547
},
{
- "x": 605.6589965820312,
- "y": 227.24000549316406
+ "x": 605.6640014648438,
+ "y": 249.9929962158203
},
{
- "x": 601.927001953125,
- "y": 229.14199829101562
+ "x": 601.9879760742188,
+ "y": 249.98500061035156
},
{
- "x": 598.155029296875,
- "y": 230.96499633789062
+ "x": 598.302978515625,
+ "y": 249.9739990234375
},
{
- "x": 594.3469848632812,
- "y": 232.70899963378906
+ "x": 594.6069946289062,
+ "y": 249.95799255371094
},
{
- "x": 590.5029907226562,
- "y": 234.3719940185547
+ "x": 590.89501953125,
+ "y": 249.93600463867188
},
{
- "x": 586.6240234375,
- "y": 235.9550018310547
+ "x": 587.166015625,
+ "y": 249.90699768066406
},
{
- "x": 582.7139892578125,
- "y": 237.45599365234375
+ "x": 583.416015625,
+ "y": 249.8699951171875
},
{
- "x": 578.7730102539062,
- "y": 238.875
+ "x": 579.6430053710938,
+ "y": 249.82200622558594
},
{
- "x": 574.802978515625,
- "y": 240.21099853515625
+ "x": 575.844970703125,
+ "y": 249.76199340820312
},
{
- "x": 570.8060302734375,
- "y": 241.46299743652344
+ "x": 572.0180053710938,
+ "y": 249.68800354003906
},
{
- "x": 566.7830200195312,
- "y": 242.6320037841797
+ "x": 568.1610107421875,
+ "y": 249.59800720214844
},
{
- "x": 562.7369995117188,
- "y": 243.71600341796875
+ "x": 564.27099609375,
+ "y": 249.48899841308594
},
{
- "x": 558.6699829101562,
- "y": 244.71499633789062
+ "x": 560.3469848632812,
+ "y": 249.35800170898438
},
{
- "x": 554.5819702148438,
- "y": 245.62899780273438
+ "x": 556.385986328125,
+ "y": 249.20199584960938
},
{
- "x": 550.4760131835938,
- "y": 246.45700073242188
+ "x": 552.3870239257812,
+ "y": 249.0189971923828
},
{
- "x": 546.35302734375,
- "y": 247.19900512695312
+ "x": 548.3489990234375,
+ "y": 248.80499267578125
},
{
- "x": 542.2160034179688,
- "y": 247.85400390625
+ "x": 544.2689819335938,
+ "y": 248.5570068359375
},
{
- "x": 538.0659790039062,
- "y": 248.4219970703125
+ "x": 540.1480102539062,
+ "y": 248.27099609375
},
{
- "x": 533.905029296875,
- "y": 248.9040069580078
+ "x": 535.9840087890625,
+ "y": 247.94400024414062
},
{
- "x": 529.7349853515625,
- "y": 249.29800415039062
+ "x": 531.7760009765625,
+ "y": 247.572998046875
},
{
- "x": 525.5579833984375,
- "y": 249.60499572753906
+ "x": 527.5239868164062,
+ "y": 247.1529998779297
},
{
- "x": 521.375,
- "y": 249.82400512695312
+ "x": 523.22900390625,
+ "y": 246.67999267578125
},
{
- "x": 517.18798828125,
- "y": 249.95599365234375
+ "x": 518.8889770507812,
+ "y": 246.1510009765625
},
{
- "x": 513,
- "y": 250
+ "x": 514.5050048828125,
+ "y": 245.56199645996094
},
{
- "x": 508.8110046386719,
- "y": 249.95599365234375
+ "x": 510.0780029296875,
+ "y": 244.9080047607422
},
{
- "x": 504.6239929199219,
- "y": 249.82400512695312
+ "x": 505.6090087890625,
+ "y": 244.18600463867188
},
{
- "x": 500.4410095214844,
- "y": 249.60499572753906
+ "x": 501.09698486328125,
+ "y": 243.39100646972656
},
{
- "x": 496.2640075683594,
- "y": 249.29800415039062
+ "x": 496.5459899902344,
+ "y": 242.52000427246094
},
{
- "x": 492.093994140625,
- "y": 248.9040069580078
+ "x": 491.95599365234375,
+ "y": 241.5679931640625
},
{
- "x": 487.9330139160156,
- "y": 248.4219970703125
+ "x": 487.3290100097656,
+ "y": 240.531005859375
},
{
- "x": 483.7829895019531,
- "y": 247.85400390625
+ "x": 482.6659851074219,
+ "y": 239.40499877929688
},
{
- "x": 479.64599609375,
- "y": 247.19900512695312
+ "x": 477.97198486328125,
+ "y": 238.18699645996094
},
{
- "x": 475.52301025390625,
- "y": 246.45700073242188
+ "x": 473.24700927734375,
+ "y": 236.8719940185547
},
{
- "x": 471.4169921875,
- "y": 245.62899780273438
+ "x": 468.4939880371094,
+ "y": 235.45599365234375
},
{
- "x": 467.3290100097656,
- "y": 244.71499633789062
+ "x": 463.7170104980469,
+ "y": 233.93600463867188
},
{
- "x": 463.2619934082031,
- "y": 243.71600341796875
+ "x": 458.91900634765625,
+ "y": 232.30799865722656
},
{
- "x": 459.21600341796875,
- "y": 242.6320037841797
+ "x": 454.10400390625,
+ "y": 230.56900024414062
},
{
- "x": 455.1929931640625,
- "y": 241.46299743652344
+ "x": 449.2749938964844,
+ "y": 228.71600341796875
},
{
- "x": 451.1960144042969,
- "y": 240.21099853515625
+ "x": 444.43499755859375,
+ "y": 226.74400329589844
},
{
- "x": 447.22601318359375,
- "y": 238.875
+ "x": 439.5899963378906,
+ "y": 224.6510009765625
},
{
- "x": 443.2850036621094,
- "y": 237.45599365234375
+ "x": 434.7430114746094,
+ "y": 222.43499755859375
},
{
- "x": 439.375,
- "y": 235.9550018310547
+ "x": 429.8999938964844,
+ "y": 220.0919952392578
},
{
- "x": 435.4960021972656,
- "y": 234.3719940185547
+ "x": 425.0639953613281,
+ "y": 217.6199951171875
},
{
- "x": 431.6520080566406,
- "y": 232.70899963378906
+ "x": 420.24200439453125,
+ "y": 215.01600646972656
},
{
- "x": 427.843994140625,
- "y": 230.96499633789062
+ "x": 415.43701171875,
+ "y": 212.2790069580078
},
{
- "x": 424.0719909667969,
- "y": 229.14199829101562
+ "x": 410.6549987792969,
+ "y": 209.40699768066406
},
{
- "x": 420.3399963378906,
- "y": 227.24000549316406
+ "x": 405.9020080566406,
+ "y": 206.3979949951172
},
{
- "x": 416.64898681640625,
- "y": 225.26100158691406
+ "x": 387.3290100097656,
+ "y": 225.91799926757812
},
{
- "x": 413,
- "y": 223.2050018310547
- },
- {
- "x": 409.3940124511719,
- "y": 221.07200622558594
- },
- {
- "x": 405.8340148925781,
- "y": 218.86500549316406
- },
- {
- "x": 402.3210144042969,
- "y": 216.58399963378906
- },
- {
- "x": 398.85699462890625,
- "y": 214.22900390625
- },
- {
- "x": 395.4419860839844,
- "y": 211.80299377441406
- },
- {
- "x": 392.0799865722656,
- "y": 209.30499267578125
- },
- {
- "x": 388.7699890136719,
- "y": 206.73800659179688
- },
- {
- "x": 385.5150146484375,
- "y": 204.1020050048828
- },
- {
- "x": 382.31500244140625,
- "y": 201.3990020751953
- },
- {
- "x": 379.1730041503906,
- "y": 198.6280059814453
- },
- {
- "x": 376.0899963378906,
- "y": 195.79299926757812
- },
- {
- "x": 373.0669860839844,
- "y": 192.8939971923828
- },
- {
- "x": 370.1050109863281,
- "y": 189.9320068359375
- },
- {
- "x": 367.20599365234375,
- "y": 186.90899658203125
- },
- {
- "x": 366.4079895019531,
- "y": 186.1060028076172
- },
- {
- "x": 363.6419982910156,
- "y": 183
+ "x": 379.6919860839844,
+ "y": 213.0070037841797
}
],
"isCurve": true,
@@ -2376,376 +2528,408 @@
"link": "",
"route": [
{
- "x": 998.5,
- "y": -198.21800231933594
+ "x": 1249.8909912109375,
+ "y": -267
},
{
- "x": 1003.2860107421875,
- "y": -197.53700256347656
+ "x": 1253.9620361328125,
+ "y": -251.71200561523438
},
{
- "x": 1009.4760131835938,
- "y": -196.45700073242188
+ "x": 1260.3609619140625,
+ "y": -244.74899291992188
},
{
- "x": 1015.6279907226562,
- "y": -195.18299865722656
+ "x": 1267.8199462890625,
+ "y": -241.8090057373047
},
{
- "x": 1021.7369995117188,
- "y": -193.71600341796875
+ "x": 1275.1109619140625,
+ "y": -238.64999389648438
},
{
- "x": 1027.7979736328125,
- "y": -192.05799865722656
+ "x": 1282.22802734375,
+ "y": -235.28399658203125
},
{
- "x": 1033.802978515625,
- "y": -190.21099853515625
+ "x": 1289.1650390625,
+ "y": -231.72000122070312
},
{
- "x": 1039.7469482421875,
- "y": -188.17599487304688
+ "x": 1295.9189453125,
+ "y": -227.96800231933594
},
{
- "x": 1045.6240234375,
- "y": -185.9550018310547
+ "x": 1302.4859619140625,
+ "y": -224.03799438476562
},
{
- "x": 1051.428955078125,
- "y": -183.5500030517578
+ "x": 1308.8609619140625,
+ "y": -219.94000244140625
},
{
- "x": 1057.155029296875,
- "y": -180.96499633789062
+ "x": 1315.04296875,
+ "y": -215.68499755859375
},
{
- "x": 1062.7979736328125,
- "y": -178.2010040283203
+ "x": 1321.029052734375,
+ "y": -211.28199768066406
},
{
- "x": 1068.3499755859375,
- "y": -175.26100158691406
+ "x": 1326.8170166015625,
+ "y": -206.74099731445312
},
{
- "x": 1073.8079833984375,
- "y": -172.1479949951172
+ "x": 1332.406982421875,
+ "y": -202.07200622558594
},
{
- "x": 1079.1650390625,
- "y": -168.86500549316406
+ "x": 1337.7979736328125,
+ "y": -197.28500366210938
},
{
- "x": 1084.416015625,
- "y": -165.41600036621094
+ "x": 1342.989013671875,
+ "y": -192.38800048828125
},
{
- "x": 1089.5570068359375,
- "y": -161.80299377441406
+ "x": 1347.9820556640625,
+ "y": -187.39100646972656
},
{
- "x": 1094.5810546875,
- "y": -158.031005859375
+ "x": 1352.7760009765625,
+ "y": -182.30299377441406
},
{
- "x": 1099.4840087890625,
- "y": -154.1020050048828
+ "x": 1357.3740234375,
+ "y": -177.1320037841797
},
{
- "x": 1104.261962890625,
- "y": -150.02200317382812
+ "x": 1361.7769775390625,
+ "y": -171.88600158691406
},
{
- "x": 1108.9090576171875,
- "y": -145.79299926757812
+ "x": 1365.9859619140625,
+ "y": -166.57400512695312
},
{
- "x": 1113.4210205078125,
- "y": -141.42100524902344
+ "x": 1370.0050048828125,
+ "y": -161.2030029296875
},
{
- "x": 1117.79296875,
- "y": -136.90899658203125
+ "x": 1373.8360595703125,
+ "y": -155.781005859375
},
{
- "x": 1122.02197265625,
- "y": -132.26199340820312
+ "x": 1377.4820556640625,
+ "y": -150.31300354003906
},
{
- "x": 1126.10205078125,
- "y": -127.48400115966797
+ "x": 1380.946044921875,
+ "y": -144.80799865722656
},
{
- "x": 1130.031005859375,
- "y": -122.58100128173828
+ "x": 1384.2330322265625,
+ "y": -139.27000427246094
},
{
- "x": 1133.802978515625,
- "y": -117.55699920654297
+ "x": 1387.343994140625,
+ "y": -133.7050018310547
},
{
- "x": 1137.416015625,
- "y": -112.41600036621094
+ "x": 1390.2860107421875,
+ "y": -128.11900329589844
},
{
- "x": 1140.864990234375,
- "y": -107.16500091552734
+ "x": 1393.06005859375,
+ "y": -122.51699829101562
},
{
- "x": 1144.14794921875,
- "y": -101.80799865722656
+ "x": 1395.6729736328125,
+ "y": -116.9020004272461
},
{
- "x": 1147.260986328125,
- "y": -96.3499984741211
+ "x": 1398.126953125,
+ "y": -111.27999877929688
},
{
- "x": 1150.2010498046875,
- "y": -90.7979965209961
+ "x": 1400.427978515625,
+ "y": -105.65299987792969
},
{
- "x": 1152.9649658203125,
- "y": -85.15499877929688
+ "x": 1402.5780029296875,
+ "y": -100.0260009765625
},
{
- "x": 1155.550048828125,
- "y": -79.42900085449219
+ "x": 1404.583984375,
+ "y": -94.39900207519531
},
{
- "x": 1157.9549560546875,
- "y": -73.6240005493164
+ "x": 1406.447998046875,
+ "y": -88.7770004272461
},
{
- "x": 1160.176025390625,
- "y": -67.74700164794922
+ "x": 1408.176025390625,
+ "y": -83.16100311279297
},
{
- "x": 1162.2110595703125,
- "y": -61.803001403808594
+ "x": 1409.77099609375,
+ "y": -77.552001953125
},
{
- "x": 1164.0579833984375,
- "y": -55.79800033569336
+ "x": 1411.2359619140625,
+ "y": -71.9530029296875
},
{
- "x": 1165.7159423828125,
- "y": -49.73699951171875
+ "x": 1412.5770263671875,
+ "y": -66.36299896240234
},
{
- "x": 1167.1829833984375,
- "y": -43.62799835205078
+ "x": 1413.7960205078125,
+ "y": -60.78300094604492
},
{
- "x": 1168.45703125,
- "y": -37.47600173950195
+ "x": 1414.89697265625,
+ "y": -55.2140007019043
},
{
- "x": 1169.5369873046875,
- "y": -31.285999298095703
+ "x": 1415.883056640625,
+ "y": -49.65599822998047
},
{
- "x": 1170.4219970703125,
- "y": -25.06599998474121
+ "x": 1416.7559814453125,
+ "y": -44.10900115966797
},
{
- "x": 1171.112060546875,
- "y": -18.820999145507812
+ "x": 1417.52099609375,
+ "y": -38.57099914550781
},
{
- "x": 1171.60498046875,
- "y": -12.557999610900879
+ "x": 1418.178955078125,
+ "y": -33.04199981689453
},
{
- "x": 1171.9010009765625,
- "y": -6.2820000648498535
+ "x": 1418.73095703125,
+ "y": -27.52199935913086
},
{
- "x": 1172,
+ "x": 1419.1810302734375,
+ "y": -22.007999420166016
+ },
+ {
+ "x": 1419.529052734375,
+ "y": -16.500999450683594
+ },
+ {
+ "x": 1419.7769775390625,
+ "y": -10.998000144958496
+ },
+ {
+ "x": 1419.925048828125,
+ "y": -5.498000144958496
+ },
+ {
+ "x": 1419.9749755859375,
"y": 0
},
{
- "x": 1171.9010009765625,
- "y": 6.2820000648498535
+ "x": 1419.925048828125,
+ "y": 5.498000144958496
},
{
- "x": 1171.60498046875,
- "y": 12.557999610900879
+ "x": 1419.7769775390625,
+ "y": 10.998000144958496
},
{
- "x": 1171.112060546875,
- "y": 18.820999145507812
+ "x": 1419.529052734375,
+ "y": 16.500999450683594
},
{
- "x": 1170.4219970703125,
- "y": 25.06599998474121
+ "x": 1419.1810302734375,
+ "y": 22.007999420166016
},
{
- "x": 1169.5369873046875,
- "y": 31.285999298095703
+ "x": 1418.73095703125,
+ "y": 27.52199935913086
},
{
- "x": 1168.45703125,
- "y": 37.47600173950195
+ "x": 1418.178955078125,
+ "y": 33.04199981689453
},
{
- "x": 1167.1829833984375,
- "y": 43.62799835205078
+ "x": 1417.52099609375,
+ "y": 38.57099914550781
},
{
- "x": 1165.7159423828125,
- "y": 49.73699951171875
+ "x": 1416.7559814453125,
+ "y": 44.10900115966797
},
{
- "x": 1164.0579833984375,
- "y": 55.79800033569336
+ "x": 1415.883056640625,
+ "y": 49.65599822998047
},
{
- "x": 1162.2110595703125,
- "y": 61.803001403808594
+ "x": 1414.89697265625,
+ "y": 55.2140007019043
},
{
- "x": 1160.176025390625,
- "y": 67.74700164794922
+ "x": 1413.7960205078125,
+ "y": 60.78300094604492
},
{
- "x": 1157.9549560546875,
- "y": 73.6240005493164
+ "x": 1412.5770263671875,
+ "y": 66.36299896240234
},
{
- "x": 1155.550048828125,
- "y": 79.42900085449219
+ "x": 1411.2359619140625,
+ "y": 71.9530029296875
},
{
- "x": 1152.9649658203125,
- "y": 85.15499877929688
+ "x": 1409.77099609375,
+ "y": 77.552001953125
},
{
- "x": 1150.2010498046875,
- "y": 90.7979965209961
+ "x": 1408.176025390625,
+ "y": 83.16100311279297
},
{
- "x": 1147.260986328125,
- "y": 96.3499984741211
+ "x": 1406.447998046875,
+ "y": 88.7770004272461
},
{
- "x": 1144.14794921875,
- "y": 101.80799865722656
+ "x": 1404.583984375,
+ "y": 94.39900207519531
},
{
- "x": 1140.864990234375,
- "y": 107.16500091552734
+ "x": 1402.5780029296875,
+ "y": 100.0260009765625
},
{
- "x": 1137.416015625,
- "y": 112.41600036621094
+ "x": 1400.427978515625,
+ "y": 105.65299987792969
},
{
- "x": 1133.802978515625,
- "y": 117.55699920654297
+ "x": 1398.126953125,
+ "y": 111.27999877929688
},
{
- "x": 1130.031005859375,
- "y": 122.58100128173828
+ "x": 1395.6729736328125,
+ "y": 116.9020004272461
},
{
- "x": 1126.10205078125,
- "y": 127.48400115966797
+ "x": 1393.06005859375,
+ "y": 122.51699829101562
},
{
- "x": 1122.02197265625,
- "y": 132.26199340820312
+ "x": 1390.2860107421875,
+ "y": 128.11900329589844
},
{
- "x": 1117.79296875,
- "y": 136.90899658203125
+ "x": 1387.343994140625,
+ "y": 133.7050018310547
},
{
- "x": 1113.4210205078125,
- "y": 141.42100524902344
+ "x": 1384.2330322265625,
+ "y": 139.27000427246094
},
{
- "x": 1108.9090576171875,
- "y": 145.79299926757812
+ "x": 1380.946044921875,
+ "y": 144.80799865722656
},
{
- "x": 1104.261962890625,
- "y": 150.02200317382812
+ "x": 1377.4820556640625,
+ "y": 150.31300354003906
},
{
- "x": 1099.4840087890625,
- "y": 154.1020050048828
+ "x": 1373.8360595703125,
+ "y": 155.781005859375
},
{
- "x": 1094.5810546875,
- "y": 158.031005859375
+ "x": 1370.0050048828125,
+ "y": 161.2030029296875
},
{
- "x": 1089.5570068359375,
- "y": 161.80299377441406
+ "x": 1365.9859619140625,
+ "y": 166.57400512695312
},
{
- "x": 1084.416015625,
- "y": 165.41600036621094
+ "x": 1361.7769775390625,
+ "y": 171.88600158691406
},
{
- "x": 1079.1650390625,
- "y": 168.86500549316406
+ "x": 1357.3740234375,
+ "y": 177.1320037841797
},
{
- "x": 1073.8079833984375,
- "y": 172.1479949951172
+ "x": 1352.7760009765625,
+ "y": 182.30299377441406
},
{
- "x": 1068.3499755859375,
- "y": 175.26100158691406
+ "x": 1347.9820556640625,
+ "y": 187.39100646972656
},
{
- "x": 1062.7979736328125,
- "y": 178.2010040283203
+ "x": 1342.989013671875,
+ "y": 192.38800048828125
},
{
- "x": 1057.155029296875,
- "y": 180.96499633789062
+ "x": 1337.7979736328125,
+ "y": 197.28500366210938
},
{
- "x": 1051.428955078125,
- "y": 183.5500030517578
+ "x": 1332.406982421875,
+ "y": 202.07200622558594
},
{
- "x": 1045.6240234375,
- "y": 185.9550018310547
+ "x": 1326.8170166015625,
+ "y": 206.74099731445312
},
{
- "x": 1039.7469482421875,
- "y": 188.17599487304688
+ "x": 1321.029052734375,
+ "y": 211.28199768066406
},
{
- "x": 1033.802978515625,
- "y": 190.21099853515625
+ "x": 1315.04296875,
+ "y": 215.68499755859375
},
{
- "x": 1027.7979736328125,
- "y": 192.05799865722656
+ "x": 1308.8609619140625,
+ "y": 219.94000244140625
},
{
- "x": 1021.7369995117188,
- "y": 193.71600341796875
+ "x": 1302.4859619140625,
+ "y": 224.03799438476562
},
{
- "x": 1015.6279907226562,
- "y": 195.18299865722656
+ "x": 1295.9189453125,
+ "y": 227.96800231933594
},
{
- "x": 1009.4760131835938,
- "y": 196.45700073242188
+ "x": 1289.1650390625,
+ "y": 231.72000122070312
},
{
- "x": 1003.2860107421875,
- "y": 197.53700256347656
+ "x": 1282.22802734375,
+ "y": 235.28399658203125
},
{
- "x": 998.5,
- "y": 198.21800231933594
+ "x": 1275.1109619140625,
+ "y": 238.64999389648438
+ },
+ {
+ "x": 1267.8199462890625,
+ "y": 241.8090057373047
+ },
+ {
+ "x": 1260.3609619140625,
+ "y": 244.74899291992188
+ },
+ {
+ "x": 1264.887939453125,
+ "y": 266.7250061035156
+ },
+ {
+ "x": 1249.8909912109375,
+ "y": 267
}
],
"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 73b445964..8579a8002 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 @@
-
\ 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 ae1b04fd2..277750cbc 100644
--- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json
+++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json
@@ -16,10 +16,10 @@
"type": "cycle",
"pos": {
"x": 12,
- "y": 12
+ "y": 62
},
- "width": 454,
- "height": 466,
+ "width": 554,
+ "height": 566,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -98,8 +98,8 @@
"id": "1.b",
"type": "rectangle",
"pos": {
- "x": 185,
- "y": -21
+ "x": 235,
+ "y": 29
},
"width": 53,
"height": 66,
@@ -141,7 +141,7 @@
"type": "rectangle",
"pos": {
"x": -14,
- "y": 179
+ "y": 279
},
"width": 53,
"height": 66,
@@ -182,8 +182,8 @@
"id": "1.d",
"type": "rectangle",
"pos": {
- "x": -215,
- "y": -20
+ "x": -265,
+ "y": 29
},
"width": 54,
"height": 66,
@@ -224,11 +224,11 @@
"id": "2",
"type": "cycle",
"pos": {
- "x": 485,
- "y": 61
+ "x": 585,
+ "y": 86
},
- "width": 400,
- "height": 367,
+ "width": 573,
+ "height": 517,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -265,8 +265,8 @@
"id": "2.a",
"type": "rectangle",
"pos": {
- "x": 459,
- "y": -171
+ "x": 559,
+ "y": -246
},
"width": 53,
"height": 66,
@@ -307,8 +307,8 @@
"id": "2.b",
"type": "rectangle",
"pos": {
- "x": 632,
- "y": 128
+ "x": 818,
+ "y": 203
},
"width": 53,
"height": 66,
@@ -349,8 +349,8 @@
"id": "2.c",
"type": "rectangle",
"pos": {
- "x": 285,
- "y": 129
+ "x": 299,
+ "y": 204
},
"width": 53,
"height": 66,
@@ -391,11 +391,11 @@
"id": "3",
"type": "cycle",
"pos": {
- "x": 904,
+ "x": 1178,
"y": 12
},
"width": 53,
- "height": 466,
+ "height": 666,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -432,8 +432,8 @@
"id": "3.a",
"type": "rectangle",
"pos": {
- "x": 878,
- "y": -221
+ "x": 1151,
+ "y": -321
},
"width": 53,
"height": 66,
@@ -474,8 +474,8 @@
"id": "3.b",
"type": "rectangle",
"pos": {
- "x": 878,
- "y": 179
+ "x": 1151,
+ "y": 279
},
"width": 53,
"height": 66,
@@ -541,335 +541,343 @@
"route": [
{
"x": 38.5,
- "y": -186.22999572753906
+ "y": -169.53399658203125
},
{
- "x": 40.18000030517578,
- "y": -186.00399780273438
+ "x": 41.19200134277344,
+ "y": -167.34300231933594
},
{
- "x": 43.2859992980957,
- "y": -185.53700256347656
+ "x": 44.257999420166016,
+ "y": -164.7830047607422
},
{
- "x": 46.3849983215332,
- "y": -185.02099609375
+ "x": 47.4640007019043,
+ "y": -162.02499389648438
},
{
- "x": 49.47600173950195,
- "y": -184.45700073242188
+ "x": 50.595001220703125,
+ "y": -159.2449951171875
},
{
- "x": 52.55699920654297,
- "y": -183.843994140625
+ "x": 53.65299987792969,
+ "y": -156.44700622558594
},
{
- "x": 55.62799835205078,
- "y": -183.18299865722656
+ "x": 56.63800048828125,
+ "y": -153.63499450683594
},
{
- "x": 58.68899917602539,
- "y": -182.47300720214844
+ "x": 59.551998138427734,
+ "y": -150.81300354003906
},
{
- "x": 61.73699951171875,
- "y": -181.71600341796875
+ "x": 62.39500045776367,
+ "y": -147.98300170898438
},
{
- "x": 64.77400207519531,
- "y": -180.91099548339844
+ "x": 65.16999816894531,
+ "y": -145.1490020751953
},
{
- "x": 67.7979965209961,
- "y": -180.05799865722656
+ "x": 67.87699890136719,
+ "y": -142.31500244140625
},
{
- "x": 70.80799865722656,
- "y": -179.1580047607422
+ "x": 70.5199966430664,
+ "y": -139.48300170898438
},
{
- "x": 73.8030014038086,
- "y": -178.21099853515625
+ "x": 73.0989990234375,
+ "y": -136.65699768066406
},
{
- "x": 76.78299713134766,
- "y": -177.2169952392578
+ "x": 75.61599731445312,
+ "y": -133.83999633789062
},
{
- "x": 79.74700164794922,
- "y": -176.17599487304688
+ "x": 78.07499694824219,
+ "y": -131.03500366210938
},
{
- "x": 82.69400024414062,
- "y": -175.08799743652344
+ "x": 80.47599792480469,
+ "y": -128.2429962158203
},
{
- "x": 85.6240005493164,
- "y": -173.9550018310547
+ "x": 82.822998046875,
+ "y": -125.46900177001953
},
{
- "x": 88.53600311279297,
- "y": -172.77499389648438
+ "x": 85.11799621582031,
+ "y": -122.71299743652344
},
{
- "x": 91.42900085449219,
- "y": -171.5500030517578
+ "x": 87.36399841308594,
+ "y": -119.97899627685547
},
{
- "x": 94.302001953125,
- "y": -170.27999877929688
+ "x": 89.56199645996094,
+ "y": -117.26799774169922
},
{
- "x": 97.15499877929688,
- "y": -168.96499633789062
+ "x": 91.71700286865234,
+ "y": -114.58300018310547
},
{
- "x": 99.98699951171875,
- "y": -167.60499572753906
+ "x": 93.83000183105469,
+ "y": -111.92500305175781
},
{
- "x": 102.7979965209961,
- "y": -166.2010040283203
+ "x": 95.90399932861328,
+ "y": -109.29499816894531
},
{
- "x": 105.58499908447266,
- "y": -164.7530059814453
+ "x": 97.94200134277344,
+ "y": -106.69599914550781
},
{
- "x": 108.3499984741211,
- "y": -163.26100158691406
+ "x": 99.947998046875,
+ "y": -104.12799835205078
},
{
- "x": 111.09100341796875,
- "y": -161.7259979248047
+ "x": 101.92400360107422,
+ "y": -101.59300231933594
},
{
- "x": 113.80799865722656,
- "y": -160.1479949951172
+ "x": 103.8740005493164,
+ "y": -99.09100341796875
},
{
- "x": 116.4990005493164,
- "y": -158.5279998779297
+ "x": 105.79900360107422,
+ "y": -96.62300109863281
},
{
- "x": 119.16500091552734,
- "y": -156.86500549316406
+ "x": 107.7030029296875,
+ "y": -94.19000244140625
},
{
- "x": 121.80400085449219,
- "y": -155.16099548339844
+ "x": 109.58999633789062,
+ "y": -91.79299926757812
},
{
- "x": 124.41600036621094,
- "y": -153.41600036621094
+ "x": 111.46199798583984,
+ "y": -89.43000030517578
},
{
- "x": 127.0009994506836,
- "y": -151.62899780273438
+ "x": 113.3219985961914,
+ "y": -87.10299682617188
},
{
- "x": 129.5570068359375,
- "y": -149.80299377441406
+ "x": 115.1729965209961,
+ "y": -84.81199645996094
},
{
- "x": 132.08399963378906,
- "y": -147.93600463867188
+ "x": 117.01899719238281,
+ "y": -82.55599975585938
},
{
- "x": 134.58099365234375,
- "y": -146.031005859375
+ "x": 118.86100006103516,
+ "y": -80.33399963378906
},
{
- "x": 137.04800415039062,
- "y": -144.08599853515625
+ "x": 120.7030029296875,
+ "y": -78.14700317382812
},
{
- "x": 139.48399353027344,
- "y": -142.1020050048828
+ "x": 122.5479965209961,
+ "y": -75.99299621582031
},
{
- "x": 141.88900756835938,
- "y": -140.08099365234375
+ "x": 124.39700317382812,
+ "y": -73.87100219726562
},
{
- "x": 144.26199340820312,
- "y": -138.02200317382812
+ "x": 126.25499725341797,
+ "y": -71.77999877929688
},
{
- "x": 146.6020050048828,
- "y": -135.92599487304688
+ "x": 128.1230010986328,
+ "y": -69.72000122070312
},
{
- "x": 148.90899658203125,
- "y": -133.79299926757812
+ "x": 130.0050048828125,
+ "y": -67.68800354003906
},
{
- "x": 151.1820068359375,
- "y": -131.625
+ "x": 131.9010009765625,
+ "y": -65.68299865722656
},
{
- "x": 153.42100524902344,
- "y": -129.42100524902344
+ "x": 133.81500244140625,
+ "y": -63.70399856567383
},
{
- "x": 155.625,
- "y": -127.18199920654297
+ "x": 135.74899291992188,
+ "y": -61.749000549316406
},
{
- "x": 157.79299926757812,
- "y": -124.90899658203125
+ "x": 137.70399475097656,
+ "y": -59.814998626708984
},
{
- "x": 159.92599487304688,
- "y": -122.60199737548828
+ "x": 139.68299865722656,
+ "y": -57.9010009765625
},
{
- "x": 162.02200317382812,
- "y": -120.26200103759766
+ "x": 141.68800354003906,
+ "y": -56.005001068115234
},
{
- "x": 164.08099365234375,
- "y": -117.88899993896484
+ "x": 143.72000122070312,
+ "y": -54.12300109863281
},
{
- "x": 166.1020050048828,
- "y": -115.48400115966797
+ "x": 145.77999877929688,
+ "y": -52.255001068115234
},
{
- "x": 168.08599853515625,
- "y": -113.0479965209961
+ "x": 147.87100219726562,
+ "y": -50.39699935913086
},
{
- "x": 170.031005859375,
- "y": -110.58100128173828
+ "x": 149.9929962158203,
+ "y": -48.54800033569336
},
{
- "x": 171.93600463867188,
- "y": -108.08399963378906
+ "x": 152.14700317382812,
+ "y": -46.702999114990234
},
{
- "x": 173.80299377441406,
- "y": -105.55699920654297
+ "x": 154.33399963378906,
+ "y": -44.861000061035156
},
{
- "x": 175.62899780273438,
- "y": -103.0009994506836
+ "x": 156.55599975585938,
+ "y": -43.01900100708008
},
{
- "x": 177.41600036621094,
- "y": -100.41600036621094
+ "x": 158.81199645996094,
+ "y": -41.17300033569336
},
{
- "x": 179.16099548339844,
- "y": -97.80400085449219
+ "x": 161.10299682617188,
+ "y": -39.321998596191406
},
{
- "x": 180.86500549316406,
- "y": -95.16500091552734
+ "x": 163.42999267578125,
+ "y": -37.46200180053711
},
{
- "x": 182.5279998779297,
- "y": -92.4990005493164
+ "x": 165.79299926757812,
+ "y": -35.59000015258789
},
{
- "x": 184.1479949951172,
- "y": -89.80799865722656
+ "x": 168.19000244140625,
+ "y": -33.702999114990234
},
{
- "x": 185.7259979248047,
- "y": -87.09100341796875
+ "x": 170.6230010986328,
+ "y": -31.798999786376953
},
{
- "x": 187.26100158691406,
- "y": -84.3499984741211
+ "x": 173.09100341796875,
+ "y": -29.874000549316406
},
{
- "x": 188.7530059814453,
- "y": -81.58499908447266
+ "x": 175.59300231933594,
+ "y": -27.923999786376953
},
{
- "x": 190.2010040283203,
- "y": -78.7979965209961
+ "x": 178.1280059814453,
+ "y": -25.947999954223633
},
{
- "x": 191.60499572753906,
- "y": -75.98699951171875
+ "x": 180.6959991455078,
+ "y": -23.941999435424805
},
{
- "x": 192.96499633789062,
- "y": -73.15499877929688
+ "x": 183.2949981689453,
+ "y": -21.90399932861328
},
{
- "x": 194.27999877929688,
- "y": -70.302001953125
+ "x": 185.9250030517578,
+ "y": -19.829999923706055
},
{
- "x": 195.5500030517578,
- "y": -67.42900085449219
+ "x": 188.58299255371094,
+ "y": -17.716999053955078
},
{
- "x": 196.77499389648438,
- "y": -64.53600311279297
+ "x": 191.26800537109375,
+ "y": -15.562000274658203
},
{
- "x": 197.9550018310547,
- "y": -61.624000549316406
+ "x": 193.97900390625,
+ "y": -13.36400032043457
},
{
- "x": 199.08799743652344,
- "y": -58.694000244140625
+ "x": 196.71299743652344,
+ "y": -11.118000030517578
},
{
- "x": 200.17599487304688,
- "y": -55.74700164794922
+ "x": 199.468994140625,
+ "y": -8.822999954223633
},
{
- "x": 201.2169952392578,
- "y": -52.78300094604492
+ "x": 202.2429962158203,
+ "y": -6.47599983215332
},
{
- "x": 202.21099853515625,
- "y": -49.803001403808594
+ "x": 205.03500366210938,
+ "y": -4.074999809265137
},
{
- "x": 203.1580047607422,
- "y": -46.80799865722656
+ "x": 207.83999633789062,
+ "y": -1.6160000562667847
},
{
- "x": 204.05799865722656,
- "y": -43.79800033569336
+ "x": 210.65699768066406,
+ "y": 0.8999999761581421
},
{
- "x": 204.91099548339844,
- "y": -40.77399826049805
+ "x": 213.48300170898438,
+ "y": 3.4790000915527344
},
{
- "x": 205.71600341796875,
- "y": -37.73699951171875
+ "x": 216.31500244140625,
+ "y": 6.122000217437744
},
{
- "x": 206.47300720214844,
- "y": -34.68899917602539
+ "x": 219.1490020751953,
+ "y": 8.829000473022461
},
{
- "x": 207.18299865722656,
- "y": -31.628000259399414
+ "x": 221.98300170898438,
+ "y": 11.604000091552734
},
{
- "x": 207.843994140625,
- "y": -28.55699920654297
+ "x": 224.81300354003906,
+ "y": 14.446999549865723
},
{
- "x": 208.45700073242188,
- "y": -25.47599983215332
+ "x": 227.63499450683594,
+ "y": 17.361000061035156
},
{
- "x": 208.5659942626953,
- "y": -25.10099983215332
+ "x": 230.44700622558594,
+ "y": 20.34600067138672
},
{
- "x": 209.2519989013672,
- "y": -21
+ "x": 233.2449951171875,
+ "y": 23.40399932861328
+ },
+ {
+ "x": 236.0019989013672,
+ "y": 14.156999588012695
+ },
+ {
+ "x": 238.16799926757812,
+ "y": 29
}
],
"isCurve": true,
@@ -904,336 +912,344 @@
"link": "",
"route": [
{
- "x": 209.2519989013672,
- "y": 45
+ "x": 238.16799926757812,
+ "y": 95
},
{
- "x": 209.02099609375,
- "y": 46.3849983215332
+ "x": 235.8699951171875,
+ "y": 97.6449966430664
},
{
- "x": 208.45700073242188,
- "y": 49.47600173950195
+ "x": 233.2449951171875,
+ "y": 100.59500122070312
},
{
- "x": 207.843994140625,
- "y": 52.55699920654297
+ "x": 230.44700622558594,
+ "y": 103.65299987792969
},
{
- "x": 207.18299865722656,
- "y": 55.62799835205078
+ "x": 227.63499450683594,
+ "y": 106.63800048828125
},
{
- "x": 206.47300720214844,
- "y": 58.68899917602539
+ "x": 224.81300354003906,
+ "y": 109.552001953125
},
{
- "x": 205.71600341796875,
- "y": 61.73699951171875
+ "x": 221.98300170898438,
+ "y": 112.3949966430664
},
{
- "x": 204.91099548339844,
- "y": 64.77400207519531
+ "x": 219.1490020751953,
+ "y": 115.16999816894531
},
{
- "x": 204.05799865722656,
- "y": 67.7979965209961
+ "x": 216.31500244140625,
+ "y": 117.87699890136719
},
{
- "x": 203.1580047607422,
- "y": 70.80799865722656
+ "x": 213.48300170898438,
+ "y": 120.5199966430664
},
{
- "x": 202.21099853515625,
- "y": 73.8030014038086
+ "x": 210.65699768066406,
+ "y": 123.0989990234375
},
{
- "x": 201.2169952392578,
- "y": 76.78299713134766
+ "x": 207.83999633789062,
+ "y": 125.61599731445312
},
{
- "x": 200.17599487304688,
- "y": 79.74700164794922
+ "x": 205.03500366210938,
+ "y": 128.0749969482422
},
{
- "x": 199.08799743652344,
- "y": 82.69400024414062
+ "x": 202.2429962158203,
+ "y": 130.4759979248047
},
{
- "x": 197.9550018310547,
- "y": 85.6240005493164
+ "x": 199.468994140625,
+ "y": 132.822998046875
},
{
- "x": 196.77499389648438,
- "y": 88.53600311279297
+ "x": 196.71299743652344,
+ "y": 135.1179962158203
},
{
- "x": 195.5500030517578,
- "y": 91.42900085449219
+ "x": 193.97900390625,
+ "y": 137.36399841308594
},
{
- "x": 194.27999877929688,
- "y": 94.302001953125
+ "x": 191.26800537109375,
+ "y": 139.56199645996094
},
{
- "x": 192.96499633789062,
- "y": 97.15499877929688
+ "x": 188.58299255371094,
+ "y": 141.7169952392578
},
{
- "x": 191.60499572753906,
- "y": 99.98699951171875
+ "x": 185.9250030517578,
+ "y": 143.8300018310547
},
{
- "x": 190.2010040283203,
- "y": 102.7979965209961
+ "x": 183.2949981689453,
+ "y": 145.9040069580078
},
{
- "x": 188.7530059814453,
- "y": 105.58499908447266
+ "x": 180.6959991455078,
+ "y": 147.94200134277344
},
{
- "x": 187.26100158691406,
- "y": 108.3499984741211
+ "x": 178.1280059814453,
+ "y": 149.947998046875
},
{
- "x": 185.7259979248047,
- "y": 111.09100341796875
+ "x": 175.59300231933594,
+ "y": 151.9239959716797
},
{
- "x": 184.1479949951172,
- "y": 113.80799865722656
+ "x": 173.09100341796875,
+ "y": 153.87399291992188
},
{
- "x": 182.5279998779297,
- "y": 116.4990005493164
+ "x": 170.6230010986328,
+ "y": 155.7989959716797
},
{
- "x": 180.86500549316406,
- "y": 119.16500091552734
+ "x": 168.19000244140625,
+ "y": 157.7030029296875
},
{
- "x": 179.16099548339844,
- "y": 121.80400085449219
+ "x": 165.79299926757812,
+ "y": 159.58999633789062
},
{
- "x": 177.41600036621094,
- "y": 124.41600036621094
+ "x": 163.42999267578125,
+ "y": 161.46200561523438
},
{
- "x": 175.62899780273438,
- "y": 127.0009994506836
+ "x": 161.10299682617188,
+ "y": 163.32200622558594
},
{
- "x": 173.80299377441406,
- "y": 129.5570068359375
+ "x": 158.81199645996094,
+ "y": 165.17300415039062
},
{
- "x": 171.93600463867188,
- "y": 132.08399963378906
+ "x": 156.55599975585938,
+ "y": 167.0189971923828
},
{
- "x": 170.031005859375,
- "y": 134.58099365234375
+ "x": 154.33399963378906,
+ "y": 168.86099243164062
},
{
- "x": 168.08599853515625,
- "y": 137.04800415039062
+ "x": 152.14700317382812,
+ "y": 170.7030029296875
},
{
- "x": 166.1020050048828,
- "y": 139.48399353027344
+ "x": 149.9929962158203,
+ "y": 172.54800415039062
},
{
- "x": 164.08099365234375,
- "y": 141.88900756835938
+ "x": 147.87100219726562,
+ "y": 174.39700317382812
},
{
- "x": 162.02200317382812,
- "y": 144.26199340820312
+ "x": 145.77999877929688,
+ "y": 176.2550048828125
},
{
- "x": 159.92599487304688,
- "y": 146.6020050048828
+ "x": 143.72000122070312,
+ "y": 178.1230010986328
},
{
- "x": 157.79299926757812,
- "y": 148.90899658203125
+ "x": 141.68800354003906,
+ "y": 180.0050048828125
},
{
- "x": 155.625,
- "y": 151.1820068359375
+ "x": 139.68299865722656,
+ "y": 181.9010009765625
},
{
- "x": 153.42100524902344,
- "y": 153.42100524902344
+ "x": 137.70399475097656,
+ "y": 183.81500244140625
},
{
- "x": 151.1820068359375,
- "y": 155.625
+ "x": 135.74899291992188,
+ "y": 185.74899291992188
},
{
- "x": 148.90899658203125,
- "y": 157.79299926757812
+ "x": 133.81500244140625,
+ "y": 187.70399475097656
},
{
- "x": 146.6020050048828,
- "y": 159.92599487304688
+ "x": 131.9010009765625,
+ "y": 189.68299865722656
},
{
- "x": 144.26199340820312,
- "y": 162.02200317382812
+ "x": 130.0050048828125,
+ "y": 191.68800354003906
},
{
- "x": 141.88900756835938,
- "y": 164.08099365234375
+ "x": 128.1230010986328,
+ "y": 193.72000122070312
},
{
- "x": 139.48399353027344,
- "y": 166.1020050048828
+ "x": 126.25499725341797,
+ "y": 195.77999877929688
},
{
- "x": 137.04800415039062,
- "y": 168.08599853515625
+ "x": 124.39700317382812,
+ "y": 197.87100219726562
},
{
- "x": 134.58099365234375,
- "y": 170.031005859375
+ "x": 122.5479965209961,
+ "y": 199.9929962158203
},
{
- "x": 132.08399963378906,
- "y": 171.93600463867188
+ "x": 120.7030029296875,
+ "y": 202.14700317382812
},
{
- "x": 129.5570068359375,
- "y": 173.80299377441406
+ "x": 118.86100006103516,
+ "y": 204.33399963378906
},
{
- "x": 127.0009994506836,
- "y": 175.62899780273438
+ "x": 117.01899719238281,
+ "y": 206.55599975585938
},
{
- "x": 124.41600036621094,
- "y": 177.41600036621094
+ "x": 115.1729965209961,
+ "y": 208.81199645996094
},
{
- "x": 121.80400085449219,
- "y": 179.16099548339844
+ "x": 113.3219985961914,
+ "y": 211.10299682617188
},
{
- "x": 119.16500091552734,
- "y": 180.86500549316406
+ "x": 111.46199798583984,
+ "y": 213.42999267578125
},
{
- "x": 116.4990005493164,
- "y": 182.5279998779297
+ "x": 109.58999633789062,
+ "y": 215.79299926757812
},
{
- "x": 113.80799865722656,
- "y": 184.1479949951172
+ "x": 107.7030029296875,
+ "y": 218.19000244140625
},
{
- "x": 111.09100341796875,
- "y": 185.7259979248047
+ "x": 105.79900360107422,
+ "y": 220.6230010986328
},
{
- "x": 108.3499984741211,
- "y": 187.26100158691406
+ "x": 103.8740005493164,
+ "y": 223.09100341796875
},
{
- "x": 105.58499908447266,
- "y": 188.7530059814453
+ "x": 101.92400360107422,
+ "y": 225.59300231933594
},
{
- "x": 102.7979965209961,
- "y": 190.2010040283203
+ "x": 99.947998046875,
+ "y": 228.1280059814453
},
{
- "x": 99.98699951171875,
- "y": 191.60499572753906
+ "x": 97.94200134277344,
+ "y": 230.6959991455078
},
{
- "x": 97.15499877929688,
- "y": 192.96499633789062
+ "x": 95.90399932861328,
+ "y": 233.2949981689453
},
{
- "x": 94.302001953125,
- "y": 194.27999877929688
+ "x": 93.83000183105469,
+ "y": 235.9250030517578
},
{
- "x": 91.42900085449219,
- "y": 195.5500030517578
+ "x": 91.71700286865234,
+ "y": 238.58299255371094
},
{
- "x": 88.53600311279297,
- "y": 196.77499389648438
+ "x": 89.56199645996094,
+ "y": 241.26800537109375
},
{
- "x": 85.6240005493164,
- "y": 197.9550018310547
+ "x": 87.36399841308594,
+ "y": 243.97900390625
},
{
- "x": 82.69400024414062,
- "y": 199.08799743652344
+ "x": 85.11799621582031,
+ "y": 246.71299743652344
},
{
- "x": 79.74700164794922,
- "y": 200.17599487304688
+ "x": 82.822998046875,
+ "y": 249.468994140625
},
{
- "x": 76.78299713134766,
- "y": 201.2169952392578
+ "x": 80.47599792480469,
+ "y": 252.2429962158203
},
{
- "x": 73.8030014038086,
- "y": 202.21099853515625
+ "x": 78.07499694824219,
+ "y": 255.03500366210938
},
{
- "x": 70.80799865722656,
- "y": 203.1580047607422
+ "x": 75.61599731445312,
+ "y": 257.8399963378906
},
{
- "x": 67.7979965209961,
- "y": 204.05799865722656
+ "x": 73.0989990234375,
+ "y": 260.6570129394531
},
{
- "x": 64.77400207519531,
- "y": 204.91099548339844
+ "x": 70.5199966430664,
+ "y": 263.4830017089844
},
{
- "x": 61.73699951171875,
- "y": 205.71600341796875
+ "x": 67.87699890136719,
+ "y": 266.31500244140625
},
{
- "x": 58.68899917602539,
- "y": 206.47300720214844
+ "x": 65.16999816894531,
+ "y": 269.14898681640625
},
{
- "x": 55.62799835205078,
- "y": 207.18299865722656
+ "x": 62.39500045776367,
+ "y": 271.9830017089844
},
{
- "x": 52.55699920654297,
- "y": 207.843994140625
+ "x": 59.551998138427734,
+ "y": 274.81298828125
},
{
- "x": 49.47600173950195,
- "y": 208.45700073242188
+ "x": 56.63800048828125,
+ "y": 277.635009765625
},
{
- "x": 46.3849983215332,
- "y": 209.02099609375
+ "x": 53.65299987792969,
+ "y": 280.4469909667969
},
{
- "x": 43.2859992980957,
- "y": 209.53700256347656
+ "x": 50.595001220703125,
+ "y": 283.2449951171875
},
{
- "x": 42.62200164794922,
- "y": 209.6790008544922
+ "x": 47.4640007019043,
+ "y": 286.0249938964844
+ },
+ {
+ "x": 44.257999420166016,
+ "y": 288.7829895019531
+ },
+ {
+ "x": 53.402000427246094,
+ "y": 291.8280029296875
},
{
"x": 38.5,
- "y": 210.22999572753906
+ "y": 293.53399658203125
}
],
"isCurve": true,
@@ -1269,335 +1285,343 @@
"route": [
{
"x": -14.49899959564209,
- "y": 210.22999572753906
+ "y": 293.53399658203125
},
{
- "x": -16.18000030517578,
- "y": 210.00399780273438
+ "x": -17.191999435424805,
+ "y": 291.3429870605469
},
{
- "x": -19.285999298095703,
- "y": 209.53700256347656
+ "x": -20.257999420166016,
+ "y": 288.7829895019531
},
{
- "x": -22.385000228881836,
- "y": 209.02099609375
+ "x": -23.464000701904297,
+ "y": 286.0249938964844
},
{
- "x": -25.47599983215332,
- "y": 208.45700073242188
+ "x": -26.594999313354492,
+ "y": 283.2449951171875
},
{
- "x": -28.55699920654297,
- "y": 207.843994140625
+ "x": -29.652999877929688,
+ "y": 280.4469909667969
},
{
- "x": -31.628000259399414,
- "y": 207.18299865722656
+ "x": -32.63800048828125,
+ "y": 277.635009765625
},
{
- "x": -34.68899917602539,
- "y": 206.47300720214844
+ "x": -35.551998138427734,
+ "y": 274.81298828125
},
{
- "x": -37.73699951171875,
- "y": 205.71600341796875
+ "x": -38.39500045776367,
+ "y": 271.9830017089844
},
{
- "x": -40.77399826049805,
- "y": 204.91099548339844
+ "x": -41.16999816894531,
+ "y": 269.14898681640625
},
{
- "x": -43.79800033569336,
- "y": 204.05799865722656
+ "x": -43.87699890136719,
+ "y": 266.31500244140625
},
{
- "x": -46.80799865722656,
- "y": 203.1580047607422
+ "x": -46.52000045776367,
+ "y": 263.4830017089844
},
{
- "x": -49.803001403808594,
- "y": 202.21099853515625
+ "x": -49.0989990234375,
+ "y": 260.6570129394531
},
{
- "x": -52.78300094604492,
- "y": 201.2169952392578
+ "x": -51.61600112915039,
+ "y": 257.8399963378906
},
{
- "x": -55.74700164794922,
- "y": 200.17599487304688
+ "x": -54.07500076293945,
+ "y": 255.03500366210938
},
{
- "x": -58.694000244140625,
- "y": 199.08799743652344
+ "x": -56.47600173950195,
+ "y": 252.2429962158203
},
{
- "x": -61.624000549316406,
- "y": 197.9550018310547
+ "x": -58.823001861572266,
+ "y": 249.468994140625
},
{
- "x": -64.53600311279297,
- "y": 196.77499389648438
+ "x": -61.11800003051758,
+ "y": 246.71299743652344
},
{
- "x": -67.42900085449219,
- "y": 195.5500030517578
+ "x": -63.36399841308594,
+ "y": 243.97900390625
},
{
- "x": -70.302001953125,
- "y": 194.27999877929688
+ "x": -65.56199645996094,
+ "y": 241.26800537109375
},
{
- "x": -73.15499877929688,
- "y": 192.96499633789062
+ "x": -67.71700286865234,
+ "y": 238.58299255371094
},
{
- "x": -75.98699951171875,
- "y": 191.60499572753906
+ "x": -69.83000183105469,
+ "y": 235.9250030517578
},
{
- "x": -78.7979965209961,
- "y": 190.2010040283203
+ "x": -71.90399932861328,
+ "y": 233.2949981689453
},
{
- "x": -81.58499908447266,
- "y": 188.7530059814453
+ "x": -73.94200134277344,
+ "y": 230.6959991455078
},
{
- "x": -84.3499984741211,
- "y": 187.26100158691406
+ "x": -75.947998046875,
+ "y": 228.1280059814453
},
{
- "x": -87.09100341796875,
- "y": 185.7259979248047
+ "x": -77.92400360107422,
+ "y": 225.59300231933594
},
{
- "x": -89.80799865722656,
- "y": 184.1479949951172
+ "x": -79.8740005493164,
+ "y": 223.09100341796875
},
{
- "x": -92.4990005493164,
- "y": 182.5279998779297
+ "x": -81.79900360107422,
+ "y": 220.6230010986328
},
{
- "x": -95.16500091552734,
- "y": 180.86500549316406
+ "x": -83.7030029296875,
+ "y": 218.19000244140625
},
{
- "x": -97.80400085449219,
- "y": 179.16099548339844
+ "x": -85.58999633789062,
+ "y": 215.79299926757812
},
{
- "x": -100.41600036621094,
- "y": 177.41600036621094
+ "x": -87.46199798583984,
+ "y": 213.42999267578125
},
{
- "x": -103.0009994506836,
- "y": 175.62899780273438
+ "x": -89.3219985961914,
+ "y": 211.10299682617188
},
{
- "x": -105.55699920654297,
- "y": 173.80299377441406
+ "x": -91.1729965209961,
+ "y": 208.81199645996094
},
{
- "x": -108.08399963378906,
- "y": 171.93600463867188
+ "x": -93.01899719238281,
+ "y": 206.55599975585938
},
{
- "x": -110.58100128173828,
- "y": 170.031005859375
+ "x": -94.86100006103516,
+ "y": 204.33399963378906
},
{
- "x": -113.0479965209961,
- "y": 168.08599853515625
+ "x": -96.7030029296875,
+ "y": 202.14700317382812
},
{
- "x": -115.48400115966797,
- "y": 166.1020050048828
+ "x": -98.5479965209961,
+ "y": 199.9929962158203
},
{
- "x": -117.88899993896484,
- "y": 164.08099365234375
+ "x": -100.39700317382812,
+ "y": 197.87100219726562
},
{
- "x": -120.26200103759766,
- "y": 162.02200317382812
+ "x": -102.25499725341797,
+ "y": 195.77999877929688
},
{
- "x": -122.60199737548828,
- "y": 159.92599487304688
+ "x": -104.12300109863281,
+ "y": 193.72000122070312
},
{
- "x": -124.90899658203125,
- "y": 157.79299926757812
+ "x": -106.00499725341797,
+ "y": 191.68800354003906
},
{
- "x": -127.18199920654297,
- "y": 155.625
+ "x": -107.9010009765625,
+ "y": 189.68299865722656
},
{
- "x": -129.42100524902344,
- "y": 153.42100524902344
+ "x": -109.81500244140625,
+ "y": 187.70399475097656
},
{
- "x": -131.625,
- "y": 151.1820068359375
+ "x": -111.7490005493164,
+ "y": 185.74899291992188
},
{
- "x": -133.79299926757812,
- "y": 148.90899658203125
+ "x": -113.7040023803711,
+ "y": 183.81500244140625
},
{
- "x": -135.92599487304688,
- "y": 146.6020050048828
+ "x": -115.68299865722656,
+ "y": 181.9010009765625
},
{
- "x": -138.02200317382812,
- "y": 144.26199340820312
+ "x": -117.68800354003906,
+ "y": 180.0050048828125
},
{
- "x": -140.08099365234375,
- "y": 141.88900756835938
+ "x": -119.72000122070312,
+ "y": 178.1230010986328
},
{
- "x": -142.1020050048828,
- "y": 139.48399353027344
+ "x": -121.77999877929688,
+ "y": 176.2550048828125
},
{
- "x": -144.08599853515625,
- "y": 137.04800415039062
+ "x": -123.87100219726562,
+ "y": 174.39700317382812
},
{
- "x": -146.031005859375,
- "y": 134.58099365234375
+ "x": -125.99299621582031,
+ "y": 172.54800415039062
},
{
- "x": -147.93600463867188,
- "y": 132.08399963378906
+ "x": -128.14700317382812,
+ "y": 170.7030029296875
},
{
- "x": -149.80299377441406,
- "y": 129.5570068359375
+ "x": -130.33399963378906,
+ "y": 168.86099243164062
},
{
- "x": -151.62899780273438,
- "y": 127.0009994506836
+ "x": -132.55599975585938,
+ "y": 167.0189971923828
},
{
- "x": -153.41600036621094,
- "y": 124.41600036621094
+ "x": -134.81199645996094,
+ "y": 165.17300415039062
},
{
- "x": -155.16099548339844,
- "y": 121.80400085449219
+ "x": -137.10299682617188,
+ "y": 163.32200622558594
},
{
- "x": -156.86500549316406,
- "y": 119.16500091552734
+ "x": -139.42999267578125,
+ "y": 161.46200561523438
},
{
- "x": -158.5279998779297,
- "y": 116.4990005493164
+ "x": -141.79299926757812,
+ "y": 159.58999633789062
},
{
- "x": -160.1479949951172,
- "y": 113.80799865722656
+ "x": -144.19000244140625,
+ "y": 157.7030029296875
},
{
- "x": -161.7259979248047,
- "y": 111.09100341796875
+ "x": -146.6230010986328,
+ "y": 155.7989959716797
},
{
- "x": -163.26100158691406,
- "y": 108.3499984741211
+ "x": -149.09100341796875,
+ "y": 153.87399291992188
},
{
- "x": -164.7530059814453,
- "y": 105.58499908447266
+ "x": -151.59300231933594,
+ "y": 151.9239959716797
},
{
- "x": -166.2010040283203,
- "y": 102.7979965209961
+ "x": -154.1280059814453,
+ "y": 149.947998046875
},
{
- "x": -167.60499572753906,
- "y": 99.98699951171875
+ "x": -156.6959991455078,
+ "y": 147.94200134277344
},
{
- "x": -168.96499633789062,
- "y": 97.15499877929688
+ "x": -159.2949981689453,
+ "y": 145.9040069580078
},
{
- "x": -170.27999877929688,
- "y": 94.302001953125
+ "x": -161.9250030517578,
+ "y": 143.8300018310547
},
{
- "x": -171.5500030517578,
- "y": 91.42900085449219
+ "x": -164.58299255371094,
+ "y": 141.7169952392578
},
{
- "x": -172.77499389648438,
- "y": 88.53600311279297
+ "x": -167.26800537109375,
+ "y": 139.56199645996094
},
{
- "x": -173.9550018310547,
- "y": 85.6240005493164
+ "x": -169.97900390625,
+ "y": 137.36399841308594
},
{
- "x": -175.08799743652344,
- "y": 82.69400024414062
+ "x": -172.71299743652344,
+ "y": 135.1179962158203
},
{
- "x": -176.17599487304688,
- "y": 79.74700164794922
+ "x": -175.468994140625,
+ "y": 132.822998046875
},
{
- "x": -177.2169952392578,
- "y": 76.78299713134766
+ "x": -178.2429962158203,
+ "y": 130.4759979248047
},
{
- "x": -178.21099853515625,
- "y": 73.8030014038086
+ "x": -181.03500366210938,
+ "y": 128.0749969482422
},
{
- "x": -179.1580047607422,
- "y": 70.80799865722656
+ "x": -183.83999633789062,
+ "y": 125.61599731445312
},
{
- "x": -180.05799865722656,
- "y": 67.7979965209961
+ "x": -186.65699768066406,
+ "y": 123.0989990234375
},
{
- "x": -180.91099548339844,
- "y": 64.77400207519531
+ "x": -189.48300170898438,
+ "y": 120.5199966430664
},
{
- "x": -181.71600341796875,
- "y": 61.73699951171875
+ "x": -192.31500244140625,
+ "y": 117.87699890136719
},
{
- "x": -182.47300720214844,
- "y": 58.68899917602539
+ "x": -195.1490020751953,
+ "y": 115.16999816894531
},
{
- "x": -183.18299865722656,
- "y": 55.62799835205078
+ "x": -197.98300170898438,
+ "y": 112.3949966430664
},
{
- "x": -183.843994140625,
- "y": 52.55699920654297
+ "x": -200.81300354003906,
+ "y": 109.552001953125
},
{
- "x": -184.45700073242188,
- "y": 49.47600173950195
+ "x": -203.63499450683594,
+ "y": 106.63800048828125
},
{
- "x": -184.5659942626953,
- "y": 49.10100173950195
+ "x": -206.44700622558594,
+ "y": 103.65299987792969
},
{
- "x": -185.2519989013672,
- "y": 45
+ "x": -209.2449951171875,
+ "y": 100.59500122070312
+ },
+ {
+ "x": -212.0019989013672,
+ "y": 109.84200286865234
+ },
+ {
+ "x": -214.16799926757812,
+ "y": 95
}
],
"isCurve": true,
@@ -1632,352 +1656,408 @@
"link": "",
"route": [
{
- "x": 512,
- "y": -136.2259979248047
+ "x": 588.7650146484375,
+ "y": -180
},
{
- "x": 514.7160034179688,
- "y": -135.85400390625
+ "x": 591.4769897460938,
+ "y": -164.81300354003906
},
{
- "x": 518.85302734375,
- "y": -135.19900512695312
+ "x": 595.7459716796875,
+ "y": -158.0500030517578
},
{
- "x": 522.9760131835938,
- "y": -134.45700073242188
+ "x": 600.72802734375,
+ "y": -155.43899536132812
},
{
- "x": 527.0819702148438,
- "y": -133.62899780273438
+ "x": 605.6060180664062,
+ "y": -152.73399353027344
},
{
- "x": 531.1699829101562,
- "y": -132.71499633789062
+ "x": 610.3790283203125,
+ "y": -149.9409942626953
},
{
- "x": 535.2369995117188,
- "y": -131.71600341796875
+ "x": 615.0449829101562,
+ "y": -147.0659942626953
},
{
- "x": 539.2830200195312,
- "y": -130.6320037841797
+ "x": 619.60302734375,
+ "y": -144.11500549316406
},
{
- "x": 543.3060302734375,
- "y": -129.46299743652344
+ "x": 624.0540161132812,
+ "y": -141.09100341796875
},
{
- "x": 547.302978515625,
- "y": -128.21099853515625
+ "x": 628.39697265625,
+ "y": -138.0019989013672
},
{
- "x": 551.2730102539062,
- "y": -126.875
+ "x": 632.6320190429688,
+ "y": -134.85299682617188
},
{
- "x": 555.2139892578125,
- "y": -125.45600128173828
+ "x": 636.7589721679688,
+ "y": -131.6479949951172
},
{
- "x": 559.1240234375,
- "y": -123.95500183105469
+ "x": 640.7789916992188,
+ "y": -128.39199829101562
},
{
- "x": 563.0029907226562,
- "y": -122.37200164794922
+ "x": 644.6929931640625,
+ "y": -125.09100341796875
},
{
- "x": 566.8469848632812,
- "y": -120.70899963378906
+ "x": 648.5020141601562,
+ "y": -121.75
},
{
- "x": 570.655029296875,
- "y": -118.96499633789062
+ "x": 652.2059936523438,
+ "y": -118.37300109863281
},
{
- "x": 574.427001953125,
- "y": -117.14199829101562
+ "x": 655.8090209960938,
+ "y": -114.96499633789062
},
{
- "x": 578.1589965820312,
- "y": -115.23999786376953
+ "x": 659.3099975585938,
+ "y": -111.53099822998047
},
{
- "x": 581.8499755859375,
- "y": -113.26100158691406
+ "x": 662.7130126953125,
+ "y": -108.0739974975586
},
{
- "x": 585.5,
- "y": -111.20500183105469
+ "x": 666.0189819335938,
+ "y": -104.5989990234375
},
{
- "x": 589.10498046875,
- "y": -109.0719985961914
+ "x": 669.22998046875,
+ "y": -101.11100006103516
},
{
- "x": 592.6649780273438,
- "y": -106.86499786376953
+ "x": 672.3499755859375,
+ "y": -97.61100006103516
},
{
- "x": 596.177978515625,
- "y": -104.58399963378906
+ "x": 675.3800048828125,
+ "y": -94.1050033569336
},
{
- "x": 599.6420288085938,
- "y": -102.22899627685547
+ "x": 678.323974609375,
+ "y": -90.59600067138672
},
{
- "x": 603.0570068359375,
- "y": -99.8030014038086
+ "x": 681.1840209960938,
+ "y": -87.08599853515625
},
{
- "x": 606.4190063476562,
- "y": -97.30500030517578
+ "x": 683.9639892578125,
+ "y": -83.5790023803711
},
{
- "x": 609.72900390625,
- "y": -94.73799896240234
+ "x": 686.666015625,
+ "y": -80.0770034790039
},
{
- "x": 612.9840087890625,
- "y": -92.10199737548828
+ "x": 689.2940063476562,
+ "y": -76.58399963378906
},
{
- "x": 616.1840209960938,
- "y": -89.39900207519531
+ "x": 691.8510131835938,
+ "y": -73.0999984741211
},
{
- "x": 619.3259887695312,
- "y": -86.62799835205078
+ "x": 694.3400268554688,
+ "y": -69.62799835205078
},
{
- "x": 622.4089965820312,
- "y": -83.79299926757812
+ "x": 696.7659912109375,
+ "y": -66.16899871826172
},
{
- "x": 625.4320068359375,
- "y": -80.89399719238281
+ "x": 699.1309814453125,
+ "y": -62.72700119018555
},
{
- "x": 628.3939819335938,
- "y": -77.93199920654297
+ "x": 701.4390258789062,
+ "y": -59.29999923706055
},
{
- "x": 631.2930297851562,
- "y": -74.90899658203125
+ "x": 703.6939697265625,
+ "y": -55.89099884033203
},
{
- "x": 634.1279907226562,
- "y": -71.82599639892578
+ "x": 705.8980102539062,
+ "y": -52.500999450683594
},
{
- "x": 636.8989868164062,
- "y": -68.68399810791016
+ "x": 708.0560302734375,
+ "y": -49.130001068115234
},
{
- "x": 639.6019897460938,
- "y": -65.48400115966797
+ "x": 710.1719970703125,
+ "y": -45.777000427246094
},
{
- "x": 642.2379760742188,
- "y": -62.229000091552734
+ "x": 712.2470092773438,
+ "y": -42.444000244140625
},
{
- "x": 644.8049926757812,
- "y": -58.91899871826172
+ "x": 714.2869873046875,
+ "y": -39.130001068115234
},
{
- "x": 647.302978515625,
- "y": -55.55699920654297
+ "x": 716.2940063476562,
+ "y": -35.834999084472656
},
{
- "x": 649.72900390625,
- "y": -52.141998291015625
+ "x": 718.27099609375,
+ "y": -32.55799865722656
},
{
- "x": 652.083984375,
- "y": -48.678001403808594
+ "x": 720.2219848632812,
+ "y": -29.29800033569336
},
{
- "x": 654.364990234375,
- "y": -45.165000915527344
+ "x": 722.1500244140625,
+ "y": -26.054000854492188
},
{
- "x": 656.572021484375,
- "y": -41.60499954223633
+ "x": 724.0570068359375,
+ "y": -22.826000213623047
},
{
- "x": 658.7050170898438,
- "y": -38
+ "x": 725.947021484375,
+ "y": -19.611000061035156
},
{
- "x": 660.760986328125,
- "y": -34.349998474121094
+ "x": 727.8209838867188,
+ "y": -16.406999588012695
},
{
- "x": 662.739990234375,
- "y": -30.659000396728516
+ "x": 729.6840209960938,
+ "y": -13.21399974822998
},
{
- "x": 664.6420288085938,
- "y": -26.927000045776367
+ "x": 731.5360107421875,
+ "y": -10.029000282287598
},
{
- "x": 666.4650268554688,
- "y": -23.155000686645508
+ "x": 733.3800048828125,
+ "y": -6.848999977111816
},
{
- "x": 668.208984375,
- "y": -19.347000122070312
+ "x": 735.218994140625,
+ "y": -3.6740000247955322
},
{
- "x": 669.8720092773438,
- "y": -15.503000259399414
+ "x": 737.052978515625,
+ "y": -0.49900001287460327
},
{
- "x": 671.4550170898438,
- "y": -11.62399959564209
+ "x": 738.885009765625,
+ "y": 2.6760001182556152
},
{
- "x": 672.9559936523438,
- "y": -7.714000225067139
+ "x": 740.7160034179688,
+ "y": 5.855999946594238
},
{
- "x": 674.375,
- "y": -3.7730000019073486
+ "x": 742.5479736328125,
+ "y": 9.043000221252441
},
{
- "x": 675.7109985351562,
- "y": 0.19599999487400055
+ "x": 744.3800048828125,
+ "y": 12.239999771118164
},
{
- "x": 676.9630126953125,
- "y": 4.192999839782715
+ "x": 746.2139892578125,
+ "y": 15.449000358581543
},
{
- "x": 678.1320190429688,
- "y": 8.215999603271484
+ "x": 748.051025390625,
+ "y": 18.673999786376953
},
{
- "x": 679.2160034179688,
- "y": 12.26200008392334
+ "x": 749.8909912109375,
+ "y": 21.917999267578125
},
{
- "x": 680.2150268554688,
- "y": 16.32900047302246
+ "x": 751.7329711914062,
+ "y": 25.18400001525879
},
{
- "x": 681.1290283203125,
- "y": 20.41699981689453
+ "x": 753.5780029296875,
+ "y": 28.47599983215332
},
{
- "x": 681.9569702148438,
- "y": 24.523000717163086
+ "x": 755.426025390625,
+ "y": 31.795000076293945
},
{
- "x": 682.698974609375,
- "y": 28.645999908447266
+ "x": 757.2750244140625,
+ "y": 35.145999908447266
},
{
- "x": 683.35400390625,
- "y": 32.78300094604492
+ "x": 759.1259765625,
+ "y": 38.53200149536133
},
{
- "x": 683.9219970703125,
- "y": 36.93299865722656
+ "x": 760.9760131835938,
+ "y": 41.95500183105469
},
{
- "x": 684.4039916992188,
- "y": 41.09400177001953
+ "x": 762.823974609375,
+ "y": 45.41899871826172
},
{
- "x": 684.7979736328125,
- "y": 45.263999938964844
+ "x": 764.6699829101562,
+ "y": 48.926998138427734
},
{
- "x": 685.10498046875,
- "y": 49.441001892089844
+ "x": 766.510986328125,
+ "y": 52.481998443603516
},
{
- "x": 685.323974609375,
- "y": 53.624000549316406
+ "x": 768.344970703125,
+ "y": 56.08599853515625
},
{
- "x": 685.4559936523438,
- "y": 57.81100082397461
+ "x": 770.1690063476562,
+ "y": 59.74300003051758
},
{
- "x": 685.5,
- "y": 61.999000549316406
+ "x": 771.9829711914062,
+ "y": 63.45500183105469
},
{
- "x": 685.4559936523438,
- "y": 66.18800354003906
+ "x": 773.781982421875,
+ "y": 67.2249984741211
},
{
- "x": 685.323974609375,
- "y": 70.375
+ "x": 775.5640258789062,
+ "y": 71.05500030517578
},
{
- "x": 685.10498046875,
- "y": 74.55799865722656
+ "x": 777.3259887695312,
+ "y": 74.9469985961914
},
{
- "x": 684.7979736328125,
- "y": 78.73500061035156
+ "x": 779.0650024414062,
+ "y": 78.90299987792969
},
{
- "x": 684.4039916992188,
- "y": 82.90499877929688
+ "x": 780.7760009765625,
+ "y": 82.9260025024414
},
{
- "x": 683.9219970703125,
- "y": 87.06600189208984
+ "x": 782.4580078125,
+ "y": 87.01699829101562
},
{
- "x": 683.35400390625,
- "y": 91.21600341796875
+ "x": 784.10498046875,
+ "y": 91.1780014038086
},
{
- "x": 682.698974609375,
- "y": 95.35299682617188
+ "x": 785.7150268554688,
+ "y": 95.41000366210938
},
{
- "x": 681.9569702148438,
- "y": 99.47599792480469
+ "x": 787.281982421875,
+ "y": 99.71399688720703
},
{
- "x": 681.1290283203125,
- "y": 103.58200073242188
+ "x": 788.802978515625,
+ "y": 104.09100341796875
},
{
- "x": 680.2150268554688,
- "y": 107.66999816894531
+ "x": 790.2739868164062,
+ "y": 108.54199981689453
},
{
- "x": 679.2160034179688,
- "y": 111.73699951171875
+ "x": 791.6890258789062,
+ "y": 113.06800079345703
},
{
- "x": 678.1320190429688,
- "y": 115.78299713134766
+ "x": 793.0460205078125,
+ "y": 117.66799926757812
},
{
- "x": 676.9630126953125,
- "y": 119.80599975585938
+ "x": 794.3380126953125,
+ "y": 122.34300231933594
},
{
- "x": 675.7109985351562,
- "y": 123.8030014038086
+ "x": 795.5609741210938,
+ "y": 127.09300231933594
},
{
- "x": 675.3259887695312,
- "y": 125.08100128173828
+ "x": 796.7119750976562,
+ "y": 131.91600036621094
},
{
- "x": 673.9329833984375,
- "y": 128.99899291992188
+ "x": 797.7839965820312,
+ "y": 136.81300354003906
+ },
+ {
+ "x": 798.7730102539062,
+ "y": 141.78199768066406
+ },
+ {
+ "x": 799.6749877929688,
+ "y": 146.82200622558594
+ },
+ {
+ "x": 800.4840087890625,
+ "y": 151.93099975585938
+ },
+ {
+ "x": 801.1959838867188,
+ "y": 157.10800170898438
+ },
+ {
+ "x": 801.8070068359375,
+ "y": 162.3509979248047
+ },
+ {
+ "x": 802.3099975585938,
+ "y": 167.656005859375
+ },
+ {
+ "x": 802.7030029296875,
+ "y": 173.02200317382812
+ },
+ {
+ "x": 802.97998046875,
+ "y": 178.4459991455078
+ },
+ {
+ "x": 803.135986328125,
+ "y": 183.9239959716797
+ },
+ {
+ "x": 803.1690063476562,
+ "y": 189.45399475097656
+ },
+ {
+ "x": 803.072021484375,
+ "y": 195.031005859375
+ },
+ {
+ "x": 802.843017578125,
+ "y": 200.65199279785156
+ },
+ {
+ "x": 826.1510009765625,
+ "y": 204.91200256347656
+ },
+ {
+ "x": 818.8070068359375,
+ "y": 217.99099731445312
}
],
"isCurve": true,
@@ -2012,336 +2092,408 @@
"link": "",
"route": [
{
- "x": 634.8569946289062,
- "y": 194.99899291992188
+ "x": 818.8070068359375,
+ "y": 225.0070037841797
},
{
- "x": 634.1279907226562,
- "y": 195.8260040283203
+ "x": 801.5159912109375,
+ "y": 218.5030059814453
},
{
- "x": 631.2930297851562,
- "y": 198.90899658203125
+ "x": 792.5969848632812,
+ "y": 218.3979949951172
},
{
- "x": 628.3939819335938,
- "y": 201.9320068359375
+ "x": 787.843994140625,
+ "y": 221.40699768066406
},
{
- "x": 625.4320068359375,
- "y": 204.8939971923828
+ "x": 783.06201171875,
+ "y": 224.2790069580078
},
{
- "x": 622.4089965820312,
- "y": 207.79299926757812
+ "x": 778.2570190429688,
+ "y": 227.01600646972656
},
{
- "x": 619.3259887695312,
- "y": 210.6280059814453
+ "x": 773.4349975585938,
+ "y": 229.6199951171875
},
{
- "x": 616.1840209960938,
- "y": 213.3990020751953
+ "x": 768.5989990234375,
+ "y": 232.0919952392578
},
{
- "x": 612.9840087890625,
- "y": 216.1020050048828
+ "x": 763.7559814453125,
+ "y": 234.43499755859375
},
{
- "x": 609.72900390625,
- "y": 218.73800659179688
+ "x": 758.9089965820312,
+ "y": 236.6510009765625
},
{
- "x": 606.4190063476562,
- "y": 221.30499267578125
+ "x": 754.0640258789062,
+ "y": 238.74400329589844
},
{
- "x": 603.0570068359375,
- "y": 223.80299377441406
+ "x": 749.2239990234375,
+ "y": 240.71600341796875
},
{
- "x": 599.6420288085938,
- "y": 226.22900390625
+ "x": 744.39501953125,
+ "y": 242.56900024414062
},
{
- "x": 596.177978515625,
- "y": 228.58399963378906
+ "x": 739.5800170898438,
+ "y": 244.30799865722656
},
{
- "x": 592.6649780273438,
- "y": 230.86500549316406
+ "x": 734.781982421875,
+ "y": 245.93600463867188
},
{
- "x": 589.10498046875,
- "y": 233.07200622558594
+ "x": 730.0050048828125,
+ "y": 247.45599365234375
+ },
+ {
+ "x": 725.2520141601562,
+ "y": 248.8719940185547
+ },
+ {
+ "x": 720.5269775390625,
+ "y": 250.18699645996094
+ },
+ {
+ "x": 715.8330078125,
+ "y": 251.40499877929688
+ },
+ {
+ "x": 711.1699829101562,
+ "y": 252.531005859375
+ },
+ {
+ "x": 706.5430297851562,
+ "y": 253.5679931640625
+ },
+ {
+ "x": 701.9530029296875,
+ "y": 254.52000427246094
+ },
+ {
+ "x": 697.4019775390625,
+ "y": 255.39100646972656
+ },
+ {
+ "x": 692.8900146484375,
+ "y": 256.1860046386719
+ },
+ {
+ "x": 688.4210205078125,
+ "y": 256.9079895019531
+ },
+ {
+ "x": 683.9940185546875,
+ "y": 257.56201171875
+ },
+ {
+ "x": 679.6099853515625,
+ "y": 258.1510009765625
+ },
+ {
+ "x": 675.27001953125,
+ "y": 258.67999267578125
+ },
+ {
+ "x": 670.9749755859375,
+ "y": 259.15301513671875
+ },
+ {
+ "x": 666.7230224609375,
+ "y": 259.572998046875
+ },
+ {
+ "x": 662.5150146484375,
+ "y": 259.9440002441406
+ },
+ {
+ "x": 658.3510131835938,
+ "y": 260.27099609375
+ },
+ {
+ "x": 654.22998046875,
+ "y": 260.5570068359375
+ },
+ {
+ "x": 650.1500244140625,
+ "y": 260.80499267578125
+ },
+ {
+ "x": 646.1119995117188,
+ "y": 261.0190124511719
+ },
+ {
+ "x": 642.1129760742188,
+ "y": 261.2019958496094
+ },
+ {
+ "x": 638.1519775390625,
+ "y": 261.3580017089844
+ },
+ {
+ "x": 634.22802734375,
+ "y": 261.489013671875
+ },
+ {
+ "x": 630.3380126953125,
+ "y": 261.5979919433594
+ },
+ {
+ "x": 626.4810180664062,
+ "y": 261.68798828125
+ },
+ {
+ "x": 622.6539916992188,
+ "y": 261.7619934082031
+ },
+ {
+ "x": 618.8560180664062,
+ "y": 261.8219909667969
+ },
+ {
+ "x": 615.0830078125,
+ "y": 261.8699951171875
+ },
+ {
+ "x": 611.3330078125,
+ "y": 261.9070129394531
+ },
+ {
+ "x": 607.60400390625,
+ "y": 261.9360046386719
+ },
+ {
+ "x": 603.8920288085938,
+ "y": 261.9580078125
+ },
+ {
+ "x": 600.1959838867188,
+ "y": 261.9739990234375
+ },
+ {
+ "x": 596.510986328125,
+ "y": 261.9849853515625
+ },
+ {
+ "x": 592.8350219726562,
+ "y": 261.9930114746094
+ },
+ {
+ "x": 589.166015625,
+ "y": 261.99700927734375
},
{
"x": 585.5,
- "y": 235.2050018310547
+ "y": 261.9989929199219
},
{
- "x": 581.8499755859375,
- "y": 237.26100158691406
+ "x": 581.8330078125,
+ "y": 261.99700927734375
},
{
- "x": 578.1589965820312,
- "y": 239.24000549316406
+ "x": 578.1640014648438,
+ "y": 261.9930114746094
},
{
- "x": 574.427001953125,
- "y": 241.14199829101562
+ "x": 574.4879760742188,
+ "y": 261.9849853515625
},
{
- "x": 570.655029296875,
- "y": 242.96499633789062
+ "x": 570.802978515625,
+ "y": 261.9739990234375
},
{
- "x": 566.8469848632812,
- "y": 244.70899963378906
+ "x": 567.1069946289062,
+ "y": 261.9580078125
},
{
- "x": 563.0029907226562,
- "y": 246.3719940185547
+ "x": 563.39501953125,
+ "y": 261.9360046386719
},
{
- "x": 559.1240234375,
- "y": 247.9550018310547
+ "x": 559.666015625,
+ "y": 261.9070129394531
},
{
- "x": 555.2139892578125,
- "y": 249.45599365234375
+ "x": 555.916015625,
+ "y": 261.8699951171875
},
{
- "x": 551.2730102539062,
- "y": 250.875
+ "x": 552.1430053710938,
+ "y": 261.8219909667969
},
{
- "x": 547.302978515625,
- "y": 252.21099853515625
+ "x": 548.344970703125,
+ "y": 261.7619934082031
},
{
- "x": 543.3060302734375,
- "y": 253.46299743652344
+ "x": 544.5180053710938,
+ "y": 261.68798828125
},
{
- "x": 539.2830200195312,
- "y": 254.6320037841797
+ "x": 540.6610107421875,
+ "y": 261.5979919433594
},
{
- "x": 535.2369995117188,
- "y": 255.71600341796875
+ "x": 536.77099609375,
+ "y": 261.489013671875
},
{
- "x": 531.1699829101562,
- "y": 256.7149963378906
+ "x": 532.8469848632812,
+ "y": 261.3580017089844
},
{
- "x": 527.0819702148438,
- "y": 257.6289978027344
+ "x": 528.885986328125,
+ "y": 261.2019958496094
},
{
- "x": 522.9760131835938,
- "y": 258.4570007324219
+ "x": 524.8870239257812,
+ "y": 261.0190124511719
},
{
- "x": 518.85302734375,
- "y": 259.1990051269531
+ "x": 520.8489990234375,
+ "y": 260.80499267578125
},
{
- "x": 514.7160034179688,
- "y": 259.85400390625
+ "x": 516.7689819335938,
+ "y": 260.5570068359375
},
{
- "x": 510.5660095214844,
- "y": 260.4219970703125
+ "x": 512.6480102539062,
+ "y": 260.27099609375
},
{
- "x": 506.4049987792969,
- "y": 260.90399169921875
+ "x": 508.4840087890625,
+ "y": 259.9440002441406
},
{
- "x": 502.2349853515625,
- "y": 261.2980041503906
+ "x": 504.2760009765625,
+ "y": 259.572998046875
},
{
- "x": 498.0580139160156,
- "y": 261.6050109863281
+ "x": 500.02398681640625,
+ "y": 259.15301513671875
},
{
- "x": 493.875,
- "y": 261.8240051269531
+ "x": 495.72900390625,
+ "y": 258.67999267578125
},
{
- "x": 489.68798828125,
- "y": 261.95599365234375
+ "x": 491.3890075683594,
+ "y": 258.1510009765625
},
{
- "x": 485.5,
- "y": 262
+ "x": 487.0050048828125,
+ "y": 257.56201171875
},
{
- "x": 481.3110046386719,
- "y": 261.95599365234375
+ "x": 482.5780029296875,
+ "y": 256.9079895019531
},
{
- "x": 477.1239929199219,
- "y": 261.8240051269531
+ "x": 478.1090087890625,
+ "y": 256.1860046386719
},
{
- "x": 472.9410095214844,
- "y": 261.6050109863281
+ "x": 473.59698486328125,
+ "y": 255.39100646972656
},
{
- "x": 468.7640075683594,
- "y": 261.2980041503906
+ "x": 469.0459899902344,
+ "y": 254.52000427246094
},
{
- "x": 464.593994140625,
- "y": 260.90399169921875
+ "x": 464.45599365234375,
+ "y": 253.5679931640625
},
{
- "x": 460.4330139160156,
- "y": 260.4219970703125
+ "x": 459.8290100097656,
+ "y": 252.531005859375
},
{
- "x": 456.2829895019531,
- "y": 259.85400390625
+ "x": 455.1659851074219,
+ "y": 251.40499877929688
},
{
- "x": 452.14599609375,
- "y": 259.1990051269531
+ "x": 450.47198486328125,
+ "y": 250.18699645996094
},
{
- "x": 448.02301025390625,
- "y": 258.4570007324219
+ "x": 445.74700927734375,
+ "y": 248.8719940185547
},
{
- "x": 443.9169921875,
- "y": 257.6289978027344
+ "x": 440.9939880371094,
+ "y": 247.45599365234375
},
{
- "x": 439.8290100097656,
- "y": 256.7149963378906
+ "x": 436.2170104980469,
+ "y": 245.93600463867188
},
{
- "x": 435.7619934082031,
- "y": 255.71600341796875
+ "x": 431.41900634765625,
+ "y": 244.30799865722656
},
{
- "x": 431.71600341796875,
- "y": 254.6320037841797
+ "x": 426.60400390625,
+ "y": 242.56900024414062
},
{
- "x": 427.6929931640625,
- "y": 253.46299743652344
+ "x": 421.7749938964844,
+ "y": 240.71600341796875
},
{
- "x": 423.6960144042969,
- "y": 252.21099853515625
+ "x": 416.93499755859375,
+ "y": 238.74400329589844
},
{
- "x": 419.72601318359375,
- "y": 250.875
+ "x": 412.0899963378906,
+ "y": 236.6510009765625
},
{
- "x": 415.7850036621094,
- "y": 249.45599365234375
+ "x": 407.2430114746094,
+ "y": 234.43499755859375
},
{
- "x": 411.875,
- "y": 247.9550018310547
+ "x": 402.3999938964844,
+ "y": 232.0919952392578
},
{
- "x": 407.9960021972656,
- "y": 246.3719940185547
+ "x": 397.5639953613281,
+ "y": 229.6199951171875
},
{
- "x": 404.1520080566406,
- "y": 244.70899963378906
+ "x": 392.74200439453125,
+ "y": 227.01600646972656
},
{
- "x": 400.343994140625,
- "y": 242.96499633789062
+ "x": 387.93701171875,
+ "y": 224.2790069580078
},
{
- "x": 396.5719909667969,
- "y": 241.14199829101562
+ "x": 383.1549987792969,
+ "y": 221.40699768066406
},
{
- "x": 392.8399963378906,
- "y": 239.24000549316406
+ "x": 378.4020080566406,
+ "y": 218.3979949951172
},
{
- "x": 389.14898681640625,
- "y": 237.26100158691406
+ "x": 359.8290100097656,
+ "y": 237.91799926757812
},
{
- "x": 385.5,
- "y": 235.2050018310547
- },
- {
- "x": 381.8940124511719,
- "y": 233.07200622558594
- },
- {
- "x": 378.3340148925781,
- "y": 230.86500549316406
- },
- {
- "x": 374.8210144042969,
- "y": 228.58399963378906
- },
- {
- "x": 371.35699462890625,
- "y": 226.22900390625
- },
- {
- "x": 367.9419860839844,
- "y": 223.80299377441406
- },
- {
- "x": 364.5799865722656,
- "y": 221.30499267578125
- },
- {
- "x": 361.2699890136719,
- "y": 218.73800659179688
- },
- {
- "x": 358.0150146484375,
- "y": 216.1020050048828
- },
- {
- "x": 354.81500244140625,
- "y": 213.3990020751953
- },
- {
- "x": 351.6730041503906,
- "y": 210.6280059814453
- },
- {
- "x": 348.5899963378906,
- "y": 207.79299926757812
- },
- {
- "x": 345.5669860839844,
- "y": 204.8939971923828
- },
- {
- "x": 342.6050109863281,
- "y": 201.9320068359375
- },
- {
- "x": 339.70599365234375,
- "y": 198.90899658203125
- },
- {
- "x": 338.9079895019531,
- "y": 198.1060028076172
- },
- {
- "x": 336.1419982910156,
- "y": 195
+ "x": 352.1919860839844,
+ "y": 225.0070037841797
}
],
"isCurve": true,
@@ -2376,376 +2528,408 @@
"link": "",
"route": [
{
- "x": 931.4099731445312,
- "y": -186.21800231933594
+ "x": 1183.0059814453125,
+ "y": -255
},
{
- "x": 936.197021484375,
- "y": -185.53700256347656
+ "x": 1187.0770263671875,
+ "y": -239.71200561523438
},
{
- "x": 942.385986328125,
- "y": -184.45700073242188
+ "x": 1193.4759521484375,
+ "y": -232.74899291992188
},
{
- "x": 948.5380249023438,
- "y": -183.18299865722656
+ "x": 1200.93505859375,
+ "y": -229.8090057373047
},
{
- "x": 954.6480102539062,
- "y": -181.71600341796875
+ "x": 1208.2259521484375,
+ "y": -226.64999389648438
},
{
- "x": 960.7080078125,
- "y": -180.05799865722656
+ "x": 1215.343017578125,
+ "y": -223.28399658203125
},
{
- "x": 966.7130126953125,
- "y": -178.21099853515625
+ "x": 1222.281005859375,
+ "y": -219.72000122070312
},
{
- "x": 972.656982421875,
- "y": -176.17599487304688
+ "x": 1229.0350341796875,
+ "y": -215.96800231933594
},
{
- "x": 978.5349731445312,
- "y": -173.9550018310547
+ "x": 1235.6009521484375,
+ "y": -212.03799438476562
},
{
- "x": 984.3389892578125,
- "y": -171.5500030517578
+ "x": 1241.9759521484375,
+ "y": -207.94000244140625
},
{
- "x": 990.0659790039062,
- "y": -168.96499633789062
+ "x": 1248.157958984375,
+ "y": -203.68499755859375
},
{
- "x": 995.7080078125,
- "y": -166.2010040283203
+ "x": 1254.14404296875,
+ "y": -199.28199768066406
},
{
- "x": 1001.260009765625,
- "y": -163.26100158691406
+ "x": 1259.9329833984375,
+ "y": -194.74099731445312
},
{
- "x": 1006.718017578125,
- "y": -160.1479949951172
+ "x": 1265.52197265625,
+ "y": -190.07200622558594
},
{
- "x": 1012.0750122070312,
- "y": -156.86500549316406
+ "x": 1270.9129638671875,
+ "y": -185.28500366210938
},
{
- "x": 1017.3259887695312,
- "y": -153.41600036621094
+ "x": 1276.10498046875,
+ "y": -180.38800048828125
},
{
- "x": 1022.4669799804688,
- "y": -149.80299377441406
+ "x": 1281.0970458984375,
+ "y": -175.39100646972656
},
{
- "x": 1027.490966796875,
- "y": -146.031005859375
+ "x": 1285.8919677734375,
+ "y": -170.30299377441406
},
{
- "x": 1032.39404296875,
- "y": -142.1020050048828
+ "x": 1290.489013671875,
+ "y": -165.1320037841797
},
{
- "x": 1037.1719970703125,
- "y": -138.02200317382812
+ "x": 1294.8919677734375,
+ "y": -159.88600158691406
},
{
- "x": 1041.8189697265625,
- "y": -133.79299926757812
+ "x": 1299.10205078125,
+ "y": -154.57400512695312
},
{
- "x": 1046.3310546875,
- "y": -129.42100524902344
+ "x": 1303.1199951171875,
+ "y": -149.2030029296875
},
{
- "x": 1050.7030029296875,
- "y": -124.90899658203125
+ "x": 1306.9510498046875,
+ "y": -143.781005859375
},
{
- "x": 1054.9320068359375,
- "y": -120.26200103759766
+ "x": 1310.5970458984375,
+ "y": -138.31300354003906
},
{
- "x": 1059.011962890625,
- "y": -115.48400115966797
+ "x": 1314.06201171875,
+ "y": -132.80799865722656
},
{
- "x": 1062.9410400390625,
- "y": -110.58100128173828
+ "x": 1317.3480224609375,
+ "y": -127.2699966430664
},
{
- "x": 1066.7130126953125,
- "y": -105.55699920654297
+ "x": 1320.4599609375,
+ "y": -121.70500183105469
},
{
- "x": 1070.3260498046875,
- "y": -100.41600036621094
+ "x": 1323.4010009765625,
+ "y": -116.11900329589844
},
{
- "x": 1073.7750244140625,
- "y": -95.16500091552734
+ "x": 1326.176025390625,
+ "y": -110.51699829101562
},
{
- "x": 1077.0579833984375,
- "y": -89.80799865722656
+ "x": 1328.7879638671875,
+ "y": -104.9020004272461
},
{
- "x": 1080.1710205078125,
- "y": -84.3499984741211
+ "x": 1331.241943359375,
+ "y": -99.27999877929688
},
{
- "x": 1083.1109619140625,
- "y": -78.7979965209961
+ "x": 1333.54296875,
+ "y": -93.65299987792969
},
{
- "x": 1085.875,
- "y": -73.15499877929688
+ "x": 1335.6939697265625,
+ "y": -88.0260009765625
},
{
- "x": 1088.4610595703125,
- "y": -67.42900085449219
+ "x": 1337.698974609375,
+ "y": -82.39900207519531
},
{
- "x": 1090.864990234375,
- "y": -61.624000549316406
+ "x": 1339.56396484375,
+ "y": -76.7770004272461
},
{
- "x": 1093.0860595703125,
- "y": -55.74700164794922
+ "x": 1341.291015625,
+ "y": -71.16100311279297
},
{
- "x": 1095.1209716796875,
- "y": -49.803001403808594
+ "x": 1342.885986328125,
+ "y": -65.552001953125
},
{
- "x": 1096.968017578125,
- "y": -43.79800033569336
+ "x": 1344.35205078125,
+ "y": -59.952999114990234
},
{
- "x": 1098.6259765625,
- "y": -37.73699951171875
+ "x": 1345.6920166015625,
+ "y": -54.362998962402344
},
{
- "x": 1100.093017578125,
- "y": -31.628000259399414
+ "x": 1346.9110107421875,
+ "y": -48.78300094604492
},
{
- "x": 1101.366943359375,
- "y": -25.47599983215332
+ "x": 1348.011962890625,
+ "y": -43.2140007019043
},
{
- "x": 1102.447021484375,
- "y": -19.285999298095703
+ "x": 1348.998046875,
+ "y": -37.65599822998047
},
{
- "x": 1103.3330078125,
- "y": -13.065999984741211
+ "x": 1349.8719482421875,
+ "y": -32.10900115966797
},
{
- "x": 1104.02197265625,
- "y": -6.821000099182129
+ "x": 1350.635986328125,
+ "y": -26.570999145507812
},
{
- "x": 1104.5150146484375,
- "y": -0.5580000281333923
+ "x": 1351.2939453125,
+ "y": -21.04199981689453
},
{
- "x": 1104.81103515625,
- "y": 5.7170000076293945
+ "x": 1351.845947265625,
+ "y": -15.522000312805176
},
{
- "x": 1104.9100341796875,
+ "x": 1352.2960205078125,
+ "y": -10.008000373840332
+ },
+ {
+ "x": 1352.64404296875,
+ "y": -4.500999927520752
+ },
+ {
+ "x": 1352.8919677734375,
+ "y": 1.0010000467300415
+ },
+ {
+ "x": 1353.041015625,
+ "y": 6.500999927520752
+ },
+ {
+ "x": 1353.0899658203125,
"y": 12
},
{
- "x": 1104.81103515625,
- "y": 18.281999588012695
+ "x": 1353.041015625,
+ "y": 17.49799919128418
},
{
- "x": 1104.5150146484375,
- "y": 24.558000564575195
+ "x": 1352.8919677734375,
+ "y": 22.99799919128418
},
{
- "x": 1104.02197265625,
- "y": 30.820999145507812
+ "x": 1352.64404296875,
+ "y": 28.500999450683594
},
{
- "x": 1103.3330078125,
- "y": 37.066001892089844
+ "x": 1352.2960205078125,
+ "y": 34.007999420166016
},
{
- "x": 1102.447021484375,
- "y": 43.2859992980957
+ "x": 1351.845947265625,
+ "y": 39.52199935913086
},
{
- "x": 1101.366943359375,
- "y": 49.47600173950195
+ "x": 1351.2939453125,
+ "y": 45.04199981689453
},
{
- "x": 1100.093017578125,
- "y": 55.62799835205078
+ "x": 1350.635986328125,
+ "y": 50.57099914550781
},
{
- "x": 1098.6259765625,
- "y": 61.73699951171875
+ "x": 1349.8719482421875,
+ "y": 56.10900115966797
},
{
- "x": 1096.968017578125,
- "y": 67.7979965209961
+ "x": 1348.998046875,
+ "y": 61.65599822998047
},
{
- "x": 1095.1209716796875,
- "y": 73.8030014038086
+ "x": 1348.011962890625,
+ "y": 67.21399688720703
},
{
- "x": 1093.0860595703125,
- "y": 79.74700164794922
+ "x": 1346.9110107421875,
+ "y": 72.78299713134766
},
{
- "x": 1090.864990234375,
- "y": 85.6240005493164
+ "x": 1345.6920166015625,
+ "y": 78.36299896240234
},
{
- "x": 1088.4610595703125,
- "y": 91.42900085449219
+ "x": 1344.35205078125,
+ "y": 83.9530029296875
},
{
- "x": 1085.875,
- "y": 97.15499877929688
+ "x": 1342.885986328125,
+ "y": 89.552001953125
},
{
- "x": 1083.1109619140625,
- "y": 102.7979965209961
+ "x": 1341.291015625,
+ "y": 95.16100311279297
},
{
- "x": 1080.1710205078125,
- "y": 108.3499984741211
+ "x": 1339.56396484375,
+ "y": 100.7770004272461
},
{
- "x": 1077.0579833984375,
- "y": 113.80799865722656
+ "x": 1337.698974609375,
+ "y": 106.39900207519531
},
{
- "x": 1073.7750244140625,
- "y": 119.16500091552734
+ "x": 1335.6939697265625,
+ "y": 112.0260009765625
},
{
- "x": 1070.3260498046875,
- "y": 124.41600036621094
+ "x": 1333.54296875,
+ "y": 117.65299987792969
},
{
- "x": 1066.7130126953125,
- "y": 129.5570068359375
+ "x": 1331.241943359375,
+ "y": 123.27999877929688
},
{
- "x": 1062.9410400390625,
- "y": 134.58099365234375
+ "x": 1328.7879638671875,
+ "y": 128.90199279785156
},
{
- "x": 1059.011962890625,
- "y": 139.48399353027344
+ "x": 1326.176025390625,
+ "y": 134.51699829101562
},
{
- "x": 1054.9320068359375,
- "y": 144.26199340820312
+ "x": 1323.4010009765625,
+ "y": 140.11900329589844
},
{
- "x": 1050.7030029296875,
- "y": 148.90899658203125
+ "x": 1320.4599609375,
+ "y": 145.7050018310547
},
{
- "x": 1046.3310546875,
- "y": 153.42100524902344
+ "x": 1317.3480224609375,
+ "y": 151.27000427246094
},
{
- "x": 1041.8189697265625,
- "y": 157.79299926757812
+ "x": 1314.06201171875,
+ "y": 156.80799865722656
},
{
- "x": 1037.1719970703125,
- "y": 162.02200317382812
+ "x": 1310.5970458984375,
+ "y": 162.31300354003906
},
{
- "x": 1032.39404296875,
- "y": 166.1020050048828
+ "x": 1306.9510498046875,
+ "y": 167.781005859375
},
{
- "x": 1027.490966796875,
- "y": 170.031005859375
+ "x": 1303.1199951171875,
+ "y": 173.2030029296875
},
{
- "x": 1022.4669799804688,
- "y": 173.80299377441406
+ "x": 1299.10205078125,
+ "y": 178.57400512695312
},
{
- "x": 1017.3259887695312,
- "y": 177.41600036621094
+ "x": 1294.8919677734375,
+ "y": 183.88600158691406
},
{
- "x": 1012.0750122070312,
- "y": 180.86500549316406
+ "x": 1290.489013671875,
+ "y": 189.1320037841797
},
{
- "x": 1006.718017578125,
- "y": 184.1479949951172
+ "x": 1285.8919677734375,
+ "y": 194.30299377441406
},
{
- "x": 1001.260009765625,
- "y": 187.26100158691406
+ "x": 1281.0970458984375,
+ "y": 199.39100646972656
},
{
- "x": 995.7080078125,
- "y": 190.2010040283203
+ "x": 1276.10498046875,
+ "y": 204.38800048828125
},
{
- "x": 990.0659790039062,
- "y": 192.96499633789062
+ "x": 1270.9129638671875,
+ "y": 209.28500366210938
},
{
- "x": 984.3389892578125,
- "y": 195.5500030517578
+ "x": 1265.52197265625,
+ "y": 214.07200622558594
},
{
- "x": 978.5349731445312,
- "y": 197.9550018310547
+ "x": 1259.9329833984375,
+ "y": 218.74099731445312
},
{
- "x": 972.656982421875,
- "y": 200.17599487304688
+ "x": 1254.14404296875,
+ "y": 223.28199768066406
},
{
- "x": 966.7130126953125,
- "y": 202.21099853515625
+ "x": 1248.157958984375,
+ "y": 227.68499755859375
},
{
- "x": 960.7080078125,
- "y": 204.05799865722656
+ "x": 1241.9759521484375,
+ "y": 231.94000244140625
},
{
- "x": 954.6480102539062,
- "y": 205.71600341796875
+ "x": 1235.6009521484375,
+ "y": 236.03799438476562
},
{
- "x": 948.5380249023438,
- "y": 207.18299865722656
+ "x": 1229.0350341796875,
+ "y": 239.96800231933594
},
{
- "x": 942.385986328125,
- "y": 208.45700073242188
+ "x": 1222.281005859375,
+ "y": 243.72000122070312
},
{
- "x": 936.197021484375,
- "y": 209.53700256347656
+ "x": 1215.343017578125,
+ "y": 247.28399658203125
},
{
- "x": 931.4099731445312,
- "y": 210.21800231933594
+ "x": 1208.2259521484375,
+ "y": 250.64999389648438
+ },
+ {
+ "x": 1200.93505859375,
+ "y": 253.8090057373047
+ },
+ {
+ "x": 1193.4759521484375,
+ "y": 256.7489929199219
+ },
+ {
+ "x": 1198.0040283203125,
+ "y": 278.7250061035156
+ },
+ {
+ "x": 1183.0059814453125,
+ "y": 279
}
],
"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 5bada1dcf..6505cf6e6 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 @@
-
\ No newline at end of file